Some 'gui' bugfixes.

This commit is contained in:
Louwrentius 2009-12-17 14:45:15 +00:00
parent 3abe84f218
commit f3666a49d6

16
ppss.sh
View File

@ -1428,7 +1428,8 @@ commando () {
echo -e "" >> "$ITEM_LOG_FILE" 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)" BEFORE="$(date +%s)"
TMP=`echo $COMMAND | grep -i '$ITEM'` TMP=`echo $COMMAND | grep -i '$ITEM'`
@ -1454,7 +1455,10 @@ commando () {
echo -e "Status:\t\tSUCCESS" >> "$ITEM_LOG_FILE" echo -e "Status:\t\tSUCCESS" >> "$ITEM_LOG_FILE"
fi 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" ] if [ "$TRANSFER_TO_SLAVE" == "1" ]
then then
if [ -e "$ITEM" ] if [ -e "$ITEM" ]
@ -1566,7 +1570,6 @@ listen_for_job () {
then then
kill "$SSH_MASTER_PID" kill "$SSH_MASTER_PID"
fi fi
log INFO "Finished. Consult $JOB_LOG_DIR for job output."
break break
else else
commando "$event" & commando "$event" &
@ -1595,7 +1598,14 @@ listen_for_job () {
set_status STOPPED set_status STOPPED
log DEBUG "Listener stopped." log DEBUG "Listener stopped."
if [ ! "$PERCENT" == "100" ]
then
echo
log INFO "Finished. Consult $JOB_LOG_DIR for job output."
log INFO "Press ENTER to continue." log INFO "Press ENTER to continue."
else
log INFO "Finished. Consult $JOB_LOG_DIR for job output."
fi
cleanup cleanup
} }