From f3666a49d69fc22b11019a9b9eaf1e5cbeecf193 Mon Sep 17 00:00:00 2001 From: Louwrentius Date: Thu, 17 Dec 2009 14:45:15 +0000 Subject: [PATCH] Some 'gui' bugfixes. --- ppss.sh | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/ppss.sh b/ppss.sh index 84b1dff..720b2ed 100755 --- a/ppss.sh +++ b/ppss.sh @@ -1428,7 +1428,8 @@ commando () { echo -e "" >> "$ITEM_LOG_FILE" # - # The actual execution of the command. + # The actual execution of the command as specified by + # the -c option. # BEFORE="$(date +%s)" TMP=`echo $COMMAND | grep -i '$ITEM'` @@ -1454,7 +1455,10 @@ commando () { echo -e "Status:\t\tSUCCESS" >> "$ITEM_LOG_FILE" fi - #Remove the item after it has been processed as not to fill up disk space. + # + # If part of a cluster, remove the downloaded item after + # it has been processed and uploaded as not to fill up disk space. + # if [ "$TRANSFER_TO_SLAVE" == "1" ] then if [ -e "$ITEM" ] @@ -1566,7 +1570,6 @@ listen_for_job () { then kill "$SSH_MASTER_PID" fi - log INFO "Finished. Consult $JOB_LOG_DIR for job output." break else commando "$event" & @@ -1595,7 +1598,14 @@ listen_for_job () { set_status STOPPED log DEBUG "Listener stopped." - log INFO "Press ENTER to continue." + if [ ! "$PERCENT" == "100" ] + then + echo + log INFO "Finished. Consult $JOB_LOG_DIR for job output." + log INFO "Press ENTER to continue." + else + log INFO "Finished. Consult $JOB_LOG_DIR for job output." + fi cleanup }