[Swift-commit] r7335 - trunk/bin

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2013-11-26 11:07:01 -0600 (Tue, 26 Nov 2013)
New Revision: 7335

Modified:
   trunk/bin/swift
   trunk/bin/swiftrun
Log:
Use new script.dir java property for saving submit scripts to run directory


Modified: trunk/bin/swift
===================================================================
--- trunk/bin/swift	2013-11-25 19:54:34 UTC (rev 7334)
+++ trunk/bin/swift	2013-11-26 17:07:01 UTC (rev 7335)
@@ -155,11 +155,9 @@
    CMDLINE="$( swiftrun $CMDLINE )"
    for cmd in $CMDLINE
    do
-      if [[ "$cmd" == *-Duser.home* ]];
+      if [[ "$cmd" == *-Dscript.dir* ]];
       then
-         if [ -z "$SWIFT_USERHOME" ]; then
-            OPTIONS="$OPTIONS $cmd"
-         fi
+         OPTIONS="$OPTIONS $cmd"
          CMDLINE=$( echo $CMDLINE | sed s@$cmd@@g )
       fi
    done

Modified: trunk/bin/swiftrun
===================================================================
--- trunk/bin/swiftrun	2013-11-25 19:54:34 UTC (rev 7334)
+++ trunk/bin/swiftrun	2013-11-26 17:07:01 UTC (rev 7335)
@@ -253,7 +253,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);
+ at new_swift_args = ("-Dscript.dir=" . $run_directory . "/scripts");
 
 # Write swift configuration files
 &write_sites("sites.xml") if defined( $option_siteslist ) || defined($properties{site});