From 2db8cab1a180deacb22edc8e40ebf546e0a01f6a Mon Sep 17 00:00:00 2001 From: Louwrentius Date: Sat, 21 Mar 2009 20:45:05 +0000 Subject: [PATCH] 2.11 - Ok version with fixed file handling when using input file instead of dir --- branches/distributed-ppss/ppss.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/branches/distributed-ppss/ppss.sh b/branches/distributed-ppss/ppss.sh index 559f378..0b65305 100755 --- a/branches/distributed-ppss/ppss.sh +++ b/branches/distributed-ppss/ppss.sh @@ -557,12 +557,12 @@ init_vars () { exit fi - if [ ! -e "$PPSS_LOCAL_TMPDIR" ] && [ ! -z "$SSH_SERVER" ] + if [ ! -e "$PPSS_LOCAL_TMPDIR" ] then mkdir "$PPSS_LOCAL_TMPDIR" fi - if [ ! -e "$PPSS_LOCAL_OUTPUT" ] && [ ! -z "$SSH_SERVER" ] + if [ ! -e "$PPSS_LOCAL_OUTPUT" ] then mkdir "$PPSS_LOCAL_OUTPUT" fi @@ -902,10 +902,10 @@ download_item () { 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" $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" $PPSS_LOCAL_TMPDIR + cp "$ITEM" ./$PPSS_LOCAL_TMPDIR log DEBUG "Exit code of local transfer is $?" fi else @@ -1132,7 +1132,7 @@ commando () { ITEM="$SRC_DIR/$ITEM" fi else - ITEM="$PPSS_LOCAL_TMPDIR/$ITEM_NO_PATH" + ITEM="./$PPSS_LOCAL_TMPDIR/$ITEM_NO_PATH" fi LOG_FILE_NAME=`echo "$ITEM" | sed s/^\\\.//g | sed s/^\\\.\\\.//g | sed s/\\\///g`