significant bugfixes when using no script

This commit is contained in:
Louwrentius 2009-03-21 22:37:38 +00:00
parent b3ba085fbe
commit bd75afbf41

View File

@ -153,7 +153,7 @@ showusage () {
echo -e "--user | -u The SSH user name that is used when logging in into the master SSH" echo -e "--user | -u The SSH user name that is used when logging in into the master SSH"
echo -e " server." echo -e " server."
echo echo
echo -e "--script | -s Specifies the script/program that must be copied to the nodes for " echo -e "--script | -S Specifies the script/program that must be copied to the nodes for "
echo -e " execution through PPSS. Only used in the deploy mode." echo -e " execution through PPSS. Only used in the deploy mode."
echo -e " This option should be specified if necessary when generating a config." echo -e " This option should be specified if necessary when generating a config."
echo echo
@ -659,8 +659,11 @@ deploy () {
set_error $? set_error $?
scp -q $SSH_OPTS $SSH_KEY known_hosts $USER@$NODE:~/$PPSS_HOME_DIR scp -q $SSH_OPTS $SSH_KEY known_hosts $USER@$NODE:~/$PPSS_HOME_DIR
set_error $? set_error $?
if [ ! -z "$SCRIPT" ]
then
scp -q $SSH_OPTS $SSH_KEY $SCRIPT $USER@$NODE:~/$PPSS_HOME_DIR scp -q $SSH_OPTS $SSH_KEY $SCRIPT $USER@$NODE:~/$PPSS_HOME_DIR
set_error $? set_error $?
fi
if [ ! -z "$INPUT_FILE" ] if [ ! -z "$INPUT_FILE" ]
then then
@ -694,7 +697,7 @@ deploy_ppss () {
exit 1 exit 1
fi fi
if [ ! -e "$SCRIPT" ] if [ ! -e "$SCRIPT" ] && [ ! -z "$SCRIPT" ]
then then
log INFO "ERROR - script $SCRIPT not found." log INFO "ERROR - script $SCRIPT not found."
cleanup cleanup