[Swift-commit] r7373 - branches/release-0.95/bin

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2013-12-04 11:59:01 -0600 (Wed, 04 Dec 2013)
New Revision: 7373

Modified:
   branches/release-0.95/bin/swift
   branches/release-0.95/bin/swiftrun
Log:
Changes for setting location of restart log


Modified: branches/release-0.95/bin/swift
===================================================================
--- branches/release-0.95/bin/swift	2013-12-04 16:40:13 UTC (rev 7372)
+++ branches/release-0.95/bin/swift	2013-12-04 17:59:01 UTC (rev 7373)
@@ -155,7 +155,7 @@
    CMDLINE="$( swiftrun $CMDLINE )"
    for cmd in $CMDLINE
    do
-      if [[ "$cmd" == *-Dscript.dir* ]]; then
+      if [[ "$cmd" == *-Dscript.dir* ]] || [[ "$cmd" == *-Drestart.log.name* ]]; then
          OPTIONS="$OPTIONS $cmd"
          CMDLINE=$( echo $CMDLINE | sed s@$cmd@@g )
       elif [[ "$cmd" == *--SWIFTRUNQUIT* ]]; then

Modified: branches/release-0.95/bin/swiftrun
===================================================================
--- branches/release-0.95/bin/swiftrun	2013-12-04 16:40:13 UTC (rev 7372)
+++ branches/release-0.95/bin/swiftrun	2013-12-04 17:59:01 UTC (rev 7373)
@@ -341,6 +341,7 @@
 $run_directory = getcwd() . "/" . sprintf "run%03s", $run_number;
 mkdir($run_directory) || die "Unable to create run directory $run_directory\n";
 @new_swift_args = ("-Dscript.dir=" . $run_directory . "/scripts");
+push(@new_swift_args, "-Drestart.log.name=" . $run_directory . "/restart.log");
 
 # Write swift configuration files
 &write_sites("sites.xml") if defined( $option_siteslist ) || defined($properties{site});