[Swift-commit] r7830 - SwiftApps/swift-galaxy/swift

[ketan at ci.uchicago.edu]

Author: ketan
Date: 2014-05-06 16:47:58 -0500 (Tue, 06 May 2014)
New Revision: 7830

Modified:
   SwiftApps/swift-galaxy/swift/swiftforeach.sh
Log:
swift/T+Galaxy+Mira close to working but not yet

Modified: SwiftApps/swift-galaxy/swift/swiftforeach.sh
===================================================================
--- SwiftApps/swift-galaxy/swift/swiftforeach.sh	2014-05-06 19:42:57 UTC (rev 7829)
+++ SwiftApps/swift-galaxy/swift/swiftforeach.sh	2014-05-06 21:47:58 UTC (rev 7830)
@@ -49,7 +49,7 @@
 stringargs=$1
 shift 
 
-swift=$(which swift)
+swift=$(\which swift 2>/dev/null)
 BASEDIR=$(dirname $0)
 
 #workout the file args
@@ -232,10 +232,11 @@
  }
 EOF
 
-case {$sites} in  
+EXITCODE=0
+case $sites in  
   "Localhost" )
-   STC=$(which stc)
-   turbine=$(which turbine)
+   STC=$(\which stc)
+   turbine=$(\which turbine)
    $STC -j $(\which java) $wdir/script.swift 2>$logfile
    $turbine -n $n $wdir/script.tcl "${swiftargs}"
    EXITCODE=$?
@@ -251,7 +252,7 @@
   TURBINE_HOME=/home/wozniak/Public/sfw/ppc64/turbine
   STC=/home/wozniak/Public/sfw/ppc64/stc/bin/stc
   $STC -j $(\which java) -t checkpointing -r ${PWD} $wdir/script.swift "${swiftargs}" 2>$logfile
-  $TURBINE_HOME/scripts/submit/cobalt/turbine-cobalt-run.zsh -n $n -s $HOME/cf $wdir/script.tcl
+  $TURBINE_HOME/scripts/submit/cobalt/turbine-cobalt-run.zsh -n $n -i $HOME/prerun.sh -s $HOME/cf $wdir/script.tcl
   EXITCODE=$?
 	;;
 esac