X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fbuildor%2Fgffs_builders.sh;fp=scripts%2Fbuildor%2Fgffs_builders.sh;h=369fbbee94bfefbd038b3bffcfa1e63e1fb0a31c;hb=a5f9a2bf4ea18c78feb291b7b42fe5ce8aba8e47;hp=26ff6abdc6720b3eea400b73bf847e9d2f9744cd;hpb=17752eea9d5c3566cf0d9e7cfbc46e648c267f50;p=feisty_meow.git 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