sneak
/
ppss
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

messing around with paths in items

This commit is contained in:
Louwrentius 2009-03-21 20:17:01 +00:00
parent c0a7678f16
commit 233d3ac5dc
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
branches/distributed-ppss/ppss.sh
View File

@ -894,8 +894,8 @@ are_jobs_running () {
download_item () { download_item () {
ITEM="$1" ITEM_WITH_PATH="$1"
ITEM_WITH_PATH="$SRC_DIR/$ITEM" ITEM=`basename "$ITEM"`
if [ "$TRANSFER_TO_SLAVE" == "1" ] if [ "$TRANSFER_TO_SLAVE" == "1" ]
then then
@ -909,7 +909,7 @@ download_item () {
log DEBUG "Exit code of local transfer is $?" log DEBUG "Exit code of local transfer is $?"
fi fi
else else
log DEBUG "No transfer of item $ITEM to workpath." log DEBUG "No transfer of item $ITEM to local workpath."
fi fi
} }
@ -1000,7 +1000,7 @@ get_all_items () {
fi fi
fi fi
exec 10<$INPUT_FILE exec 10<"$INPUT_FILE"
while read LINE <&10 while read LINE <&10
do do
@ -1117,17 +1117,24 @@ elapsed () {
commando () { commando () {
ITEM="$1" ITEM="$1"
ITEM_NO_PATH="$1" ITEM_NO_PATH=`basename "$ITEM"`
OUTPUT_DIR=$PPSS_LOCAL_OUTPUT/"$ITEM_NO_PATH" OUTPUT_DIR=$PPSS_LOCAL_OUTPUT/"$ITEM_NO_PATH"
OUTPUT_FILE="$ITEM_NO_PATH" OUTPUT_FILE="$ITEM_NO_PATH"
log DEBUG "Processing item $ITEM" log DEBUG "Processing item $ITEM"
if [ -z "$INPUT_FILE" ] && [ "$TRANSFER_TO_SLAVE" == "0" ] log DEBUG "** $INPUT_FILE and $TRANSFER_TO_SLAVE - "
if [ "$TRANSFER_TO_SLAVE" == "0" ]
then then
ITEM="$SRC_DIR/$ITEM" if [ -z "$SRC_DIR" ] && [ ! -z "$INPUT_FILE" ]
then
log DEBUG "Using item straight from INPUT FILE"
else else
ITEM="$PPSS_LOCAL_TMPDIR/$ITEM" ITEM="$SRC_DIR/$ITEM"
fi
else
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`