[Swift-commit] r8001 - trunk/bin

[hategan at ci.uchicago.edu]

Author: hategan
Date: 2014-07-12 01:41:07 -0500 (Sat, 12 Jul 2014)
New Revision: 8001

Modified:
   trunk/bin/swiftrun
Log:
fixed swiftrun

Modified: trunk/bin/swiftrun
===================================================================
--- trunk/bin/swiftrun	2014-07-12 06:31:53 UTC (rev 8000)
+++ trunk/bin/swiftrun	2014-07-12 06:41:07 UTC (rev 8001)
@@ -77,7 +77,7 @@
 
 
 # Verify Swift is found in PATH
-my $swift_etc_directory = dirname(dirname($0)) . "/etc";
+my $swift_etc_directory = dirname($0) . "/../etc";
 if( ! -d $swift_etc_directory ) { &swiftquit("Unable to find a valid Swift installation"); }
 
 $run_directory = getcwd() . "/" . sprintf "run%03s", $run_number;
@@ -88,10 +88,16 @@
 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 ));
+push(@new_swift_args, "-logfile $run_directory/swift.log");
 
 $ENV{RUNDIRECTORY} = "$run_directory";
 
+while( @ARGV ) {
+   my $option = shift;
+   push( @new_swift_args, $option );
+}
+
+
 foreach my $arg( @new_swift_args ) {
    print "$arg ";
 }