[Swift-commit] r7596 - trunk/bin

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2014-02-16 10:15:23 -0600 (Sun, 16 Feb 2014)
New Revision: 7596

Modified:
   trunk/bin/swiftrun
Log:
Option to disable rundirs


Modified: trunk/bin/swiftrun
===================================================================
--- trunk/bin/swiftrun	2014-02-16 16:15:00 UTC (rev 7595)
+++ trunk/bin/swiftrun	2014-02-16 16:15:23 UTC (rev 7596)
@@ -462,12 +462,14 @@
    exit;
 }
 
- at new_swift_args = ("-Dscript.dir=$run_directory/scripts");
-push(@new_swift_args, "-Drestart.log.name=$run_directory/restart.log");
-push(@new_swift_args, "-swiftoutlog=$run_directory/swift.out");
-push(@new_swift_args, "-runid " . basename($run_directory));
-push(@new_swift_args, "-Ddebug.dir.prefix=" . basename($run_directory));  
-push( @new_swift_args, sprintf( "-logfile $run_directory/run%03s.log", $run_number ));
+if(!defined($properties{"config.rundirs"}) || $properties{"config.rundirs"} ne "false") {
+   @new_swift_args = ("-Dscript.dir=$run_directory/scripts");
+   push(@new_swift_args, "-Drestart.log.name=$run_directory/restart.log");
+   push(@new_swift_args, "-swiftoutlog=$run_directory/swift.out");
+   push(@new_swift_args, "-runid " . basename($run_directory));
+   push(@new_swift_args, "-Ddebug.dir.prefix=" . basename($run_directory) . "/");  
+   push(@new_swift_args, sprintf( "-logfile $run_directory/run%03s.log", $run_number ));
+}
 
 # Write swift configuration files
 &write_sites("sites.xml") if defined( $option_siteslist ) || defined($properties{site});