From 33b646319e76b7fce00deee707e60e26720c58f3 Mon Sep 17 00:00:00 2001 From: Louwrentius Date: Sat, 21 Mar 2009 20:34:05 +0000 Subject: [PATCH] Ok version with fixed file handling when using input file instead of dir --- branches/distributed-ppss/ppss.sh | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/branches/distributed-ppss/ppss.sh b/branches/distributed-ppss/ppss.sh index 7e27d6c..885c1e7 100755 --- a/branches/distributed-ppss/ppss.sh +++ b/branches/distributed-ppss/ppss.sh @@ -894,22 +894,22 @@ are_jobs_running () { download_item () { - ITEM_WITH_PATH="$1" - ITEM=`basename "$ITEM"` + ITEM="$1" + ITEM_NO_PATH=`basename "$ITEM"` if [ "$TRANSFER_TO_SLAVE" == "1" ] then - log DEBUG "Transfering item $ITEM to local disk." + log DEBUG "Transfering item $ITEM_NO_PATH to local disk." if [ "$SECURE_COPY" == "1" ] && [ ! -z "$SSH_SERVER" ] then - scp -q $SSH_OPTS $SSH_KEY $USER@$SSH_SERVER:"$ITEM_WITH_PATH" $PPSS_LOCAL_TMPDIR + scp -q $SSH_OPTS $SSH_KEY $USER@$SSH_SERVER:"$ITEM" $PPSS_LOCAL_TMPDIR log DEBUG "Exit code of remote transfer is $?" else - cp "$ITEM_WITH_PATH" $PPSS_LOCAL_TMPDIR + cp "$ITEM" $PPSS_LOCAL_TMPDIR log DEBUG "Exit code of local transfer is $?" fi else - log DEBUG "No transfer of item $ITEM to local workpath." + log DEBUG "No transfer of item $ITEM_NO_PATH to local workpath." fi } @@ -1123,8 +1123,6 @@ commando () { log DEBUG "Processing item $ITEM" - log DEBUG "** $INPUT_FILE and $TRANSFER_TO_SLAVE - " - if [ "$TRANSFER_TO_SLAVE" == "0" ] then if [ -z "$SRC_DIR" ] && [ ! -z "$INPUT_FILE" ]