[Swift-commit] r6142 - trunk/bin

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2013-01-07 18:01:44 -0600 (Mon, 07 Jan 2013)
New Revision: 6142

Modified:
   trunk/bin/swiftrun
Log:
Fix the gensites parameters that swiftrun uses


Modified: trunk/bin/swiftrun
===================================================================
--- trunk/bin/swiftrun	2013-01-07 23:46:39 UTC (rev 6141)
+++ trunk/bin/swiftrun	2013-01-08 00:01:44 UTC (rev 6142)
@@ -60,31 +60,27 @@
 rundir=$( echo run??? | sed -e 's/^.*run//' | awk '{ printf("run%03d\n", $1+1)}' )
 mkdir $rundir
 
+# Swift script
+if [ -f "$script" ]; then 
+   cp $script $rundir
+fi
+
 # Create sites.xml
+cd $rundir
 IFS=","
-echo "<config>" > $rundir/sites.xml
+echo "<config>" > sites.xml
 for site in $SITES
 do
    if [ -f "$CONFIG" ]; then
-      gensites -p $CONFIG -l $site >> $rundir/sites.xml
+      gensites -p $CONFIG $site >> sites.xml
    else
-      gensites -l $site >> $rundir/sites.xml
+      gensites $site >> sites.xml
    fi
 done
-echo "</config>" >> $rundir/sites.xml
+echo "</config>" >> sites.xml
 
-# tc.data
-if [ -f "tc.data" ]; then
-   cp tc.data $rundir
-fi
 
-# Swift script
-if [ -f "$script" ]; then 
-   cp $script $rundir
-fi
-
 # Run
-cd $rundir
 timestamp=$( date +%s )
 ln -s $PWD $HOME/.swift/runs/current/$rundir.$timestamp 
 time swift -sites.file sites.xml -tc.file tc.data $script $args 2>&1 | tee swift.out