[Swift-commit] r6363 - trunk/bin

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2013-03-11 06:07:17 -0500 (Mon, 11 Mar 2013)
New Revision: 6363

Modified:
   trunk/bin/gensites
   trunk/bin/swiftrun
Log:
Make swiftrun work with multiple sites


Modified: trunk/bin/gensites
===================================================================
--- trunk/bin/gensites	2013-03-10 19:35:03 UTC (rev 6362)
+++ trunk/bin/gensites	2013-03-11 11:07:17 UTC (rev 6363)
@@ -151,9 +151,9 @@
 # Setup for creating a TC file
 if [ -f "$PROPERTIES_FILE" ]; then
    if [ -n "`grep -e app $PROPERTIES_FILE`" ]; then
-      if [ -f "tc.data" ]; then
-         mv tc.data tc.data.old
-      fi
+      #if [ -f "tc.data" ]; then
+      #   mv tc.data tc.data.old
+      #fi
       HOSTS=`grep -i "pool handle" $TEMPLATE_PATH|grep -v "^[[:space:]]*#"|cut -d'"' -f2`
    fi
 fi

Modified: trunk/bin/swiftrun
===================================================================
--- trunk/bin/swiftrun	2013-03-10 19:35:03 UTC (rev 6362)
+++ trunk/bin/swiftrun	2013-03-11 11:07:17 UTC (rev 6363)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
 
 # Verify an argument is not null
 verify_not_null()
@@ -77,14 +77,17 @@
 echo "<config>" > sites.xml
 for site in $SITES
 do
+   echo SITE IS $site
+   echo FILE IS ../conf/$site.cf
    # 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
+      config=$site.cf
+      echo config IS $config
+   fi  
 
-   if [ -f "$CONFIG" ]; then
-      gensites -p $CONFIG $site >> sites.xml
+   if [ -f "$config" ]; then
+      gensites -p $config $site >> sites.xml
    else
       gensites $site >> sites.xml
    fi
@@ -92,6 +95,9 @@
 done
 echo "</config>" >> sites.xml
 
+if [ -z "$CONFIG" ]; then
+   CONFIG=$config
+fi
 
 # Run
 timestamp=$( date +%s )