[Swift-commit] r4032 - SwiftApps/SwiftR/Swift/exec

[noreply at svn.ci.uchicago.edu]

Author: tga
Date: 2011-01-24 10:30:57 -0600 (Mon, 24 Jan 2011)
New Revision: 4032

Modified:
   SwiftApps/SwiftR/Swift/exec/start-swift
Log:
A couple of bug fixes for sge start script


Modified: SwiftApps/SwiftR/Swift/exec/start-swift
===================================================================
--- SwiftApps/SwiftR/Swift/exec/start-swift	2011-01-22 20:03:47 UTC (rev 4031)
+++ SwiftApps/SwiftR/Swift/exec/start-swift	2011-01-24 16:30:57 UTC (rev 4032)
@@ -201,7 +201,7 @@
   if [ $workmode = slot ]; then
     NODES=\`cat \$PE_HOSTFILE | awk '{ for(i=0;i<\$2;i++){print \$1} }'\`
   else 
-    NODES=\`cat $PE_HOSTFILE | awk '{print \$1}'\` # Better for Ranger, Eddie, ...
+    NODES=\`cat \$PE_HOSTFILE | awk '{print \$1}'\` # Better for Ranger, Eddie, ...
   fi
 
   HOST=$(echo $CONTACT | sed -e 's,^http://,,' -e 's/:.*//')
@@ -476,11 +476,11 @@
     trap - $TRAPEVENTS
     jobid=$(cat $jobidfile)
     echo Terminating worker processes starter $starterpid and batch job $jobid
-    if [ "_$starterpid != _ ]; then
+    if [ "_$starterpid" != _ ]; then
       kill $starterpid
     fi
-    if [ "_$jobid != _ ]; then
-      qdel $jobid
+    if [ "_$jobid" != _ ]; then
+      qdel "$jobid"
     fi
     # eit cleanly
     exit 0