better path handling

This commit is contained in:
Louwrentius 2009-03-23 20:24:20 +00:00
parent 64edfe79c1
commit 113f4d31cb
1 changed files with 3 additions and 3 deletions

View File

@ -72,7 +72,7 @@ SSH_SOCKET="/tmp/PPSS-ssh-socket" # Multiplex multiple SSH connections ove
SSH_OPTS="-o BatchMode=yes -o ControlPath=$SSH_SOCKET \ SSH_OPTS="-o BatchMode=yes -o ControlPath=$SSH_SOCKET \
-o GlobalKnownHostsFile=./known_hosts \ -o GlobalKnownHostsFile=./known_hosts \
-o ControlMaster=auto \ -o ControlMaster=auto \
-o ConnectTimeout=5 " -o ConnectTimeout=15 "
SSH_MASTER_PID="" SSH_MASTER_PID=""
PPSS_HOME_DIR="ppss" PPSS_HOME_DIR="ppss"
@ -713,7 +713,7 @@ deploy_ppss () {
else else
for NODE in `cat $NODES_FILE` for NODE in `cat $NODES_FILE`
do do
deploy "$NODE" & deploy "$NODE"
done done
fi fi
} }
@ -1298,7 +1298,7 @@ show_status () {
then then
ITEMS=`exec_cmd "ls -1 $SRC_DIR | wc -l"` ITEMS=`exec_cmd "ls -1 $SRC_DIR | wc -l"`
else else
ITEMS=`exec_cmd "cat $INPUT_FILE | wc -l"` ITEMS=`exec_cmd "cat $PPSS_HOME_DIR/$INPUT_FILE | wc -l"`
fi fi
PROCESSED=`exec_cmd "ls -1 $ITEM_LOCK_DIR | wc -l"` 2>&1 >> /dev/null PROCESSED=`exec_cmd "ls -1 $ITEM_LOCK_DIR | wc -l"` 2>&1 >> /dev/null