[Swift-commit] r7395 - trunk/bin

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2013-12-10 14:11:19 -0600 (Tue, 10 Dec 2013)
New Revision: 7395

Modified:
   trunk/bin/swift
   trunk/bin/swiftrun
Log:
Use absolute path to swiftrun, so things still work when swift is not in $PATH


Modified: trunk/bin/swift
===================================================================
--- trunk/bin/swift	2013-12-10 17:39:54 UTC (rev 7394)
+++ trunk/bin/swift	2013-12-10 20:11:19 UTC (rev 7395)
@@ -150,10 +150,10 @@
 # Swiftrun
 if [[ "$CMDLINE" == *-listconfig* ]]
 then
-   swiftrun $CMDLINE
+   $SWIFT_HOME/bin/swiftrun $CMDLINE
    exit 0
 else
-   CMDLINE="$( swiftrun $CMDLINE )"
+   CMDLINE="$( $SWIFT_HOME/bin/swiftrun $CMDLINE )"
    for cmd in $CMDLINE
    do
       if [[ "$cmd" == *-Dscript.dir* ]] || [[ "$cmd" == *-Drestart.log.name* ]]; then

Modified: trunk/bin/swiftrun
===================================================================
--- trunk/bin/swiftrun	2013-12-10 17:39:54 UTC (rev 7394)
+++ trunk/bin/swiftrun	2013-12-10 20:11:19 UTC (rev 7395)
@@ -146,8 +146,10 @@
    }     
    
    # Make sure to handle special cases that are not in the namespace=x, key=y, format
-   if ( $namespace eq "jobmanager" ) { 
+   if ( $namespace eq "jobmanager" && defined($value)) { 
       my $ccount = ($value =~ s/:/:/g);
+      my $jobmanager = "";
+      my $jobmanagerURL = "";
 
       # With no separators, assume local 
       if( $ccount == 0 ) {