[Swift-commit] r6323 - branches/release-0.94/bin

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2013-03-02 15:30:48 -0600 (Sat, 02 Mar 2013)
New Revision: 6323

Modified:
   branches/release-0.94/bin/gensites
Log:
Fix the order in which gensites searches for templates: full pathname, $HOME/.swift, then etc/sites


Modified: branches/release-0.94/bin/gensites
===================================================================
--- branches/release-0.94/bin/gensites	2013-03-01 12:48:13 UTC (rev 6322)
+++ branches/release-0.94/bin/gensites	2013-03-02 21:30:48 UTC (rev 6323)
@@ -123,10 +123,10 @@
 if [ ! -f "$TEMPLATE_PATH" ]; then
    if [ -f "$TEMPLATE" ]; then
       TEMPLATE_PATH=$TEMPLATE
+   elif [ -f "$HOME/.swift/sites/$TEMPLATE" ]; then
+      TEMPLATE_PATH=$HOME/.swift/sites/$TEMPLATE
    elif [ -f "$SWIFT_HOME/$TEMPLATE" ]; then
       TEMPLATE_PATH=$SWIFT_HOME/$TEMPLATE
-   elif [ -f "$HOME/.swift/sites/$TEMPLATE" ]; then
-      TEMPLATE_PATH=$HOME/.swift/sites/$TEMPLATE
    fi
    if [ ! -f "$TEMPLATE_PATH" ]; then
       crash "Cannot find template for $TEMPLATE"