X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fbuildor%2Fbuild_xsedes.sh;h=a6a52e35ba57b2e0f6f6b3fde6b98375d9afa8eb;hb=df6eb09e6c7ce53df0caf754fe2a8d8272ca319e;hp=1996208e7549d2b257a861ac835955171f523766;hpb=f436a09a053981ca5e6f5ff249c1c08f94cc56ba;p=feisty_meow.git

diff --git a/scripts/buildor/build_xsedes.sh b/scripts/buildor/build_xsedes.sh
index 1996208e..a6a52e35 100644
--- a/scripts/buildor/build_xsedes.sh
+++ b/scripts/buildor/build_xsedes.sh
@@ -11,7 +11,7 @@ function build_xsede()
     echo GENII_INSTALL_DIR is not set.
     return 1
   fi
-  pushd $GENII_INSTALL_DIR
+  pushd "$GENII_INSTALL_DIR"
   if [ $? -ne 0 ]; then
     error_sound
     return 1
@@ -39,7 +39,7 @@ function rebuild_xsede()
     echo GENII_INSTALL_DIR is not set.
     return 1
   fi
-  pushd $GENII_INSTALL_DIR
+  pushd "$GENII_INSTALL_DIR"
   ant clean
 
   if [ $? -ne 0 ]; then
@@ -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
@@ -88,7 +98,7 @@ function fast_install_build()
   build_xsede 
   if [ $? -ne 0 ]; then echo "failed to build xsede code"; return 1; fi
 
-  bash $GENII_INSTALL_DIR/xsede_tools/tools/installer/fast_installer_build.sh $*
+  bash "$GENII_INSTALL_DIR/xsede_tools/tools/installer/fast_installer_build.sh" $*
   if [ $? -ne 0 ]; then
     echo "failed to bootstrap create the installer."
     error_sound