removed some debugging and added missing class name definition.

[feisty_meow.git] / scripts / buildor / build_xsedes.sh

diff --git a/scripts/buildor/build_xsedes.sh b/scripts/buildor/build_xsedes.sh
index 806d8ad7e8ac338584d01ab18e23d0bf725cb88f..7b53fea5765a51a357bc130e1d9ef1e15a91d451 100644 (file)
--- a/scripts/buildor/build_xsedes.sh
+++ b/scripts/buildor/build_xsedes.sh
@@ -11,8 +11,11 @@ function build_xsede()
     echo GENII_INSTALL_DIR is not set.
     return 1
   fi
-  pushd $GENII_INSTALL_DIR
-  if [ $? -ne 0 ]; then return 1; fi
+  pushd "$GENII_INSTALL_DIR"
+  if [ $? -ne 0 ]; then
+    error_sound
+    return 1
+  fi
   echo "Build starting at: $(date)"
 
   # clean up some things.
@@ -20,7 +23,10 @@ function build_xsede()
 
   # build the trunk.
   ant -Dbuild.targetArch=64 build
-  if [ $? -ne 0 ]; then return 1; fi
+  if [ $? -ne 0 ]; then
+    error_sound
+    return 1
+  fi
   echo "Build done at: $(date)"
   popd
 
@@ -33,10 +39,13 @@ 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 return 1; fi
+  if [ $? -ne 0 ]; then
+    error_sound
+    return 1
+  fi
   popd
   build_xsede
 }
@@ -47,8 +56,17 @@ 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
-  if [ $? -ne 0 ]; then echo "failed to bootstrap a container"; return 1; fi
+  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
+    return 1
+  fi
 
   success_sound  
 }
@@ -59,8 +77,17 @@ 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
-  if [ $? -ne 0 ]; then echo "failed to bootstrap a container"; return 1; fi
+  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
+    return 1
+  fi
 
   success_sound  
 }
@@ -68,11 +95,12 @@ function bu_bootstrap()
 # a shortcut for doing a quick build and then creating an installer.
 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 $*
-  if [ $? -ne 0 ]; then echo "failed to create the installer."; return 1; fi
+  bash "$GENII_INSTALL_DIR/xsede_tools/tools/installer/fast_installer_build.sh" $*
+  if [ $? -ne 0 ]; then
+    echo "failed to create the installer."
+    error_sound
+    return 1
+  fi
 
   success_sound  
 }