[Swift-commit] r6508 - trunk/libexec

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2013-05-16 13:05:03 -0500 (Thu, 16 May 2013)
New Revision: 6508

Modified:
   trunk/libexec/_swiftwrap.wrapperstaging
Log:
Temporary workaround to get file staging working with dd


Modified: trunk/libexec/_swiftwrap.wrapperstaging
===================================================================
--- trunk/libexec/_swiftwrap.wrapperstaging	2013-05-15 16:44:28 UTC (rev 6507)
+++ trunk/libexec/_swiftwrap.wrapperstaging	2013-05-16 18:05:03 UTC (rev 6508)
@@ -269,6 +269,11 @@
 	cdm_gather_action $GATHER_MAX $GATHER_OUTPUT
 }
 
+strip_prefix()
+{
+   echo $@ | sed -e s/__root__//g -e s/__parent__//g 
+}
+
 COMMANDLINE=$@
 
 PARAMFILE=
@@ -330,7 +335,7 @@
 shift $SHIFTCOUNT
 
 getarg "-d" "$@"
-DIRS=$VALUE
+DIRS=$( strip_prefix $VALUE )
 shift $SHIFTCOUNT
 
 getarg "-if" "$@"
@@ -363,7 +368,7 @@
 declare -a CMDARGS
 if [ "$PARAMFILE" == "" ] && [ "$1" == "-a" ] ; then
 	shift
-	CMDARGS=("$@")
+	CMDARGS=( $( strip_prefix "$@" ) )
 elif [ "$PARAMFILE" != "" ] ; then
 	CMDARGS=()
 	FIRST=1