[Swift-commit] r7297 - trunk/bin

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2013-11-18 14:58:53 -0600 (Mon, 18 Nov 2013)
New Revision: 7297

Modified:
   trunk/bin/swift
   trunk/bin/swiftrun
Log:
Set -Duser.home to runNNN directory, unless SWIFT_USERHOME is defined


Modified: trunk/bin/swift
===================================================================
--- trunk/bin/swift	2013-11-18 20:08:07 UTC (rev 7296)
+++ trunk/bin/swift	2013-11-18 20:58:53 UTC (rev 7297)
@@ -153,6 +153,16 @@
    exit 0
 else
    CMDLINE="$( swiftrun $CMDLINE )"
+   for cmd in $CMDLINE
+   do
+      if [[ "$cmd" == *-Duser.home* ]];
+      then
+         if [ -z "$SWIFT_USERHOME" ]; then
+            OPTIONS="$OPTIONS $cmd"
+         fi
+         CMDLINE=$( echo $CMDLINE | sed s@$cmd@@g )
+      fi
+   done
 fi
 
 ### EXECUTE ############

Modified: trunk/bin/swiftrun
===================================================================
--- trunk/bin/swiftrun	2013-11-18 20:08:07 UTC (rev 7296)
+++ trunk/bin/swiftrun	2013-11-18 20:58:53 UTC (rev 7297)
@@ -256,6 +256,7 @@
 
 $run_directory = getcwd() . "/" . sprintf "run%03s", $run_number;
 mkdir($run_directory) || die "Unable to create run directory $run_directory\n";
+ at new_swift_args = ("-Duser.home=" . $run_directory);
 
 # Write swift configuration files
 &write_sites("sites.xml") if defined( $option_siteslist ) || defined($properties{site});