Topic/cvs

Update the cvs based script with clearer logic and timeouts.
The `timeout` comand comes from coreutils which may not be present by default.