From: Chris Koeritz Date: Sun, 20 Dec 2015 16:02:09 +0000 (-0500) Subject: adapting to changing names in gffs. X-Git-Tag: 2.140.90~557 X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=17752eea9d5c3566cf0d9e7cfbc46e648c267f50;hp=d5b49ffce0af0a5731a4289ae345f7fe100d9953;p=feisty_meow.git adapting to changing names in gffs. --- diff --git a/infobase/configuration/cron/run_grid_container_non_work_hours.crontab b/infobase/configuration/cron/run_grid_container_non_work_hours.crontab index 11bb14e8..b93764bf 100644 --- a/infobase/configuration/cron/run_grid_container_non_work_hours.crontab +++ b/infobase/configuration/cron/run_grid_container_non_work_hours.crontab @@ -7,7 +7,7 @@ USER=jurgis # we need these for the GenesisII GFFS environment. GENII_INSTALL_DIR=/home/jurgis/gffs/code/GenesisII/trunk -XSEDE_TESTS_FOLDER=$GENII_INSTALL_DIR/xsede_tools +XSEDE_TESTS_FOLDER=$GENII_INSTALL_DIR/toolkit GENII_USER_DIR=/home/jurgis/.tmp/dot-genesis-xcg3 JAVA_HOME=/usr/lib/jvm/java-6-sun diff --git a/scripts/buildor/gffs_builders.sh b/scripts/buildor/gffs_builders.sh index 556009e6..26ff6abd 100644 --- a/scripts/buildor/gffs_builders.sh +++ b/scripts/buildor/gffs_builders.sh @@ -73,7 +73,7 @@ function rebu_bootstrap() rebuild_gffs if [ $? -ne 0 ]; then echo "failed to rebuild gffs code"; return 1; fi - quickstarter="$GENII_INSTALL_DIR/xsede_tools/library/bootstrap_quick_start.sh" + quickstarter="$GENII_INSTALL_DIR/toolkit/library/bootstrap_quick_start.sh" if [ ! -f "$quickstarter" ]; then quickstarter="$XSEDE_TEST_ROOT/library/bootstrap_quick_start.sh" fi @@ -95,7 +95,7 @@ function bu_bootstrap() build_gffs if [ $? -ne 0 ]; then echo "failed to rebuild gffs code"; return 1; fi - quickstarter="$GENII_INSTALL_DIR/xsede_tools/library/bootstrap_quick_start.sh" + quickstarter="$GENII_INSTALL_DIR/toolkit/library/bootstrap_quick_start.sh" if [ ! -f "$quickstarter" ]; then quickstarter="$XSEDE_TEST_ROOT/library/bootstrap_quick_start.sh" fi