From: Chris Koeritz <fred@gruntose.com>
Date: Mon, 21 Dec 2015 16:59:52 +0000 (-0500)
Subject: fixes for gffs changes.
X-Git-Tag: 2.140.90~556
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=a5f9a2bf4ea18c78feb291b7b42fe5ce8aba8e47;p=feisty_meow.git

fixes for gffs changes.
---

diff --git a/scripts/buildor/gffs_builders.sh b/scripts/buildor/gffs_builders.sh
index 26ff6abd..369fbbee 100644
--- a/scripts/buildor/gffs_builders.sh
+++ b/scripts/buildor/gffs_builders.sh
@@ -7,12 +7,12 @@ define_yeti_alias BAIL_ON_FAIL='if [ $? -ne 0 ]; then echo "A problem occurred.
 
 function zapem()
 {
-  bash $XSEDE_TEST_ROOT/library/zap_genesis_javas.sh 
+  bash $GFFS_TOOLKIT_ROOT/library/zap_genesis_javas.sh 
 }
 
 # a macro for testing the configuration.
 export GFFS_CHECK_VARS='
-  if [ -z "$GENII_INSTALL_DIR" -o -z "$XSEDE_TEST_ROOT" ]; then
+  if [ -z "$GENII_INSTALL_DIR" -o -z "$GFFS_TOOLKIT_ROOT" ]; then
     echo "GENII_INSTALL_DIR is not set.";
     return 1;
   fi '
@@ -20,7 +20,7 @@ export GFFS_CHECK_VARS='
 function build_gffs()
 {
   eval $GFFS_CHECK_VARS
-#  if [ -z "$GENII_INSTALL_DIR" -o -z "$XSEDE_TEST_ROOT" ]; then
+#  if [ -z "$GENII_INSTALL_DIR" -o -z "$GFFS_TOOLKIT_ROOT" ]; then
 #    echo GENII_INSTALL_DIR is not set.
 #    return 1
 #  fi
@@ -50,7 +50,7 @@ function build_gffs()
 function rebuild_gffs()
 {
   eval $GFFS_CHECK_VARS
-#  if [ -z "$GENII_INSTALL_DIR" -o -z "$XSEDE_TEST_ROOT" ]; then
+#  if [ -z "$GENII_INSTALL_DIR" -o -z "$GFFS_TOOLKIT_ROOT" ]; then
 #    echo GENII_INSTALL_DIR is not set.
 #    return 1
 #  fi
@@ -75,7 +75,7 @@ function rebu_bootstrap()
 
   quickstarter="$GENII_INSTALL_DIR/toolkit/library/bootstrap_quick_start.sh"
   if [ ! -f "$quickstarter" ]; then
-    quickstarter="$XSEDE_TEST_ROOT/library/bootstrap_quick_start.sh"
+    quickstarter="$GFFS_TOOLKIT_ROOT/library/bootstrap_quick_start.sh"
   fi
 
   bash "$quickstarter"
@@ -97,7 +97,7 @@ function bu_bootstrap()
 
   quickstarter="$GENII_INSTALL_DIR/toolkit/library/bootstrap_quick_start.sh"
   if [ ! -f "$quickstarter" ]; then
-    quickstarter="$XSEDE_TEST_ROOT/library/bootstrap_quick_start.sh"
+    quickstarter="$GFFS_TOOLKIT_ROOT/library/bootstrap_quick_start.sh"
   fi
 
   bash "$quickstarter"
@@ -114,7 +114,7 @@ function bu_bootstrap()
 function fast_install_build()
 {
   eval $GFFS_CHECK_VARS
-  bash "$XSEDE_TEST_ROOT/tools/installer/fast_installer_build.sh" $*
+  bash "$GFFS_TOOLKIT_ROOT/tools/installer/fast_installer_build.sh" $*
   if [ $? -ne 0 ]; then
     echo "failed to create the installer."
     error_sound
diff --git a/scripts/buildor/refresh_gffs_build.sh b/scripts/buildor/refresh_gffs_build.sh
index 8eb04e87..b24c3ae1 100644
--- a/scripts/buildor/refresh_gffs_build.sh
+++ b/scripts/buildor/refresh_gffs_build.sh
@@ -3,7 +3,7 @@
 source $FEISTY_MEOW_SCRIPTS/buildor/gffs_builders.sh
 
 echo stopping any running genesis processes...
-bash $XSEDE_TEST_ROOT/library/zap_genesis_javas.sh 
+bash $GFFS_TOOLKIT_ROOT/library/zap_genesis_javas.sh 
 
 export GFFS_LOGS="$HOME/.GenesisII"
 
@@ -21,7 +21,7 @@ build_gffs
 check_result Building GFFS source code.
 
 echo starting container now and spooling its log file...
-(bash $XSEDE_TEST_ROOT/library/maybe_restart_container.sh &>$TMP/container_restarty.log & )
+(bash $GFFS_TOOLKIT_ROOT/library/maybe_restart_container.sh &>$TMP/container_restarty.log & )
 # snooze a bit so the container gets a chance to write something.
 sleep 4
 tail -f ~/.GenesisII/container.log