2.11 - Ok version with fixed file handling when using input file instead of dir
This commit is contained in:
parent
964648de7f
commit
d2a8a6e08d
10
ppss.sh
10
ppss.sh
@ -557,12 +557,12 @@ init_vars () {
|
|||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ! -e "$PPSS_LOCAL_TMPDIR" ] && [ ! -z "$SSH_SERVER" ]
|
if [ ! -e "$PPSS_LOCAL_TMPDIR" ]
|
||||||
then
|
then
|
||||||
mkdir "$PPSS_LOCAL_TMPDIR"
|
mkdir "$PPSS_LOCAL_TMPDIR"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ! -e "$PPSS_LOCAL_OUTPUT" ] && [ ! -z "$SSH_SERVER" ]
|
if [ ! -e "$PPSS_LOCAL_OUTPUT" ]
|
||||||
then
|
then
|
||||||
mkdir "$PPSS_LOCAL_OUTPUT"
|
mkdir "$PPSS_LOCAL_OUTPUT"
|
||||||
fi
|
fi
|
||||||
@ -902,10 +902,10 @@ download_item () {
|
|||||||
log DEBUG "Transfering item $ITEM_NO_PATH to local disk."
|
log DEBUG "Transfering item $ITEM_NO_PATH to local disk."
|
||||||
if [ "$SECURE_COPY" == "1" ] && [ ! -z "$SSH_SERVER" ]
|
if [ "$SECURE_COPY" == "1" ] && [ ! -z "$SSH_SERVER" ]
|
||||||
then
|
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 $?"
|
log DEBUG "Exit code of remote transfer is $?"
|
||||||
else
|
else
|
||||||
cp "$ITEM" $PPSS_LOCAL_TMPDIR
|
cp "$ITEM" ./$PPSS_LOCAL_TMPDIR
|
||||||
log DEBUG "Exit code of local transfer is $?"
|
log DEBUG "Exit code of local transfer is $?"
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
@ -1132,7 +1132,7 @@ commando () {
|
|||||||
ITEM="$SRC_DIR/$ITEM"
|
ITEM="$SRC_DIR/$ITEM"
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
ITEM="$PPSS_LOCAL_TMPDIR/$ITEM_NO_PATH"
|
ITEM="./$PPSS_LOCAL_TMPDIR/$ITEM_NO_PATH"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
LOG_FILE_NAME=`echo "$ITEM" | sed s/^\\\.//g | sed s/^\\\.\\\.//g | sed s/\\\///g`
|
LOG_FILE_NAME=`echo "$ITEM" | sed s/^\\\.//g | sed s/^\\\.\\\.//g | sed s/\\\///g`
|
||||||
|
Loading…
Reference in New Issue
Block a user