From: Chris Koeritz <fred@gruntose.com>
Date: Wed, 3 Dec 2014 20:09:06 +0000 (-0500)
Subject: made a fallback for older xsede tests not under genesis folder.
X-Git-Tag: 2.140.90~735
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=b22f6c18085e3735f76ee6bddf3aed36f17638a8;p=feisty_meow.git

made a fallback for older xsede tests not under genesis folder.
---

diff --git a/scripts/buildor/build_xsedes.sh b/scripts/buildor/build_xsedes.sh
index e335651b..a6a52e35 100644
--- a/scripts/buildor/build_xsedes.sh
+++ b/scripts/buildor/build_xsedes.sh
@@ -56,7 +56,12 @@ function rebu_bootstrap()
   rebuild_xsede 
   if [ $? -ne 0 ]; then echo "failed to rebuild xsede code"; return 1; fi
 
-  bash "$GENII_INSTALL_DIR/xsede_tools/library/bootstrap_quick_start.sh"
+  quickstarter="$GENII_INSTALL_DIR/xsede_tools/library/bootstrap_quick_start.sh"
+  if [ ! -f "$quickstarter" ]; then
+    quickstarter="$XSEDE_TEST_ROOT/library/bootstrap_quick_start.sh"
+  fi
+
+  bash "$quickstarter"
   if [ $? -ne 0 ]; then
     echo "failed to bootstrap a container."
     error_sound
@@ -72,7 +77,12 @@ function bu_bootstrap()
   build_xsede 
   if [ $? -ne 0 ]; then echo "failed to rebuild xsede code"; return 1; fi
 
-  bash "$GENII_INSTALL_DIR/xsede_tools/library/bootstrap_quick_start.sh"
+  quickstarter="$GENII_INSTALL_DIR/xsede_tools/library/bootstrap_quick_start.sh"
+  if [ ! -f "$quickstarter" ]; then
+    quickstarter="$XSEDE_TEST_ROOT/library/bootstrap_quick_start.sh"
+  fi
+
+  bash "$quickstarter"
   if [ $? -ne 0 ]; then
     echo "failed to bootstrap a container."
     error_sound