[Swift-commit] r6605 - in branches/faster: . bin

[hategan at ci.uchicago.edu]

Author: hategan
Date: 2013-07-08 00:33:04 -0500 (Mon, 08 Jul 2013)
New Revision: 6605

Modified:
   branches/faster/
   branches/faster/bin/swiftrun
Log:
merged 6177 from trunk


Property changes on: branches/faster
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/release-0.93:4761-5122
/trunk:6172
   + /branches/release-0.93:4761-5122
/trunk:6172,6177

Modified: branches/faster/bin/swiftrun
===================================================================
--- branches/faster/bin/swiftrun	2013-07-08 05:30:38 UTC (rev 6604)
+++ branches/faster/bin/swiftrun	2013-07-08 05:33:04 UTC (rev 6605)
@@ -65,17 +65,30 @@
    cp $script $rundir
 fi
 
+# Copy config file if specified
+if [ -f "$CONFIG" ]; then
+   cp $CONFIG $rundir
+   CONFIG=$( basename $CONFIG )
+fi
+
 # Create sites.xml
 cd $rundir
 IFS=","
 echo "<config>" > sites.xml
 for site in $SITES
 do
+   # If config is not defined, but there is a config in conf/ that matches, use that
+   if [ -z "$CONFIG" ] && [ -f "../conf/$site.cf" ]; then
+      cp ../conf/$site.cf .
+      CONFIG=$site.cf
+   fi
+
    if [ -f "$CONFIG" ]; then
       gensites -p $CONFIG $site >> sites.xml
    else
       gensites $site >> sites.xml
    fi
+
 done
 echo "</config>" >> sites.xml