From 7e7383cf9baf945f6e86af15f59165003eafc803 Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Wed, 15 Jul 2015 22:01:53 -0400 Subject: [PATCH] whoosh, naming changes. --- customizing/fred/fred_common.alias | 4 ++-- customizing/fred/fred_variables.sh | 2 +- .../cron/run_grid_container_non_work_hours.crontab | 2 +- infobase/configuration/eclipse/dictionary.txt | 2 ++ scripts/archival/{zip_xsede.sh => zip_gffs.sh} | 0 .../buildor/{build_xsedes.sh => gffs_builders.sh} | 14 +++++++------- scripts/rev_control/version_control.sh | 3 ++- 7 files changed, 15 insertions(+), 12 deletions(-) rename scripts/archival/{zip_xsede.sh => zip_gffs.sh} (100%) rename scripts/buildor/{build_xsedes.sh => gffs_builders.sh} (89%) diff --git a/customizing/fred/fred_common.alias b/customizing/fred/fred_common.alias index af6629c2..63ba8eac 100644 --- a/customizing/fred/fred_common.alias +++ b/customizing/fred/fred_common.alias @@ -6,8 +6,8 @@ alias moo='check_mount /z/stuffing ; check_mount /z/walrus ; check_mount /z/chunky ; check_mount /z/fredgrid' alias unmoo='sudo umount /z/stuffing ; sudo umount /z/walrus ; sudo umount /z/chunky ; sudo umount /z/fredgrid' -# load in the xsede build scripts. -source "$FEISTY_MEOW_SCRIPTS/buildor/build_xsedes.sh" +# load in the gffs build scripts. +source "$FEISTY_MEOW_SCRIPTS/buildor/gffs_builders.sh" # just shows a separator line for an 80 column console, or uses the first # parameter as the number of columns to expect. diff --git a/customizing/fred/fred_variables.sh b/customizing/fred/fred_variables.sh index d1175df5..be4ab37e 100644 --- a/customizing/fred/fred_variables.sh +++ b/customizing/fred/fred_variables.sh @@ -17,7 +17,7 @@ if [ -z "$NETHACKOPTIONS" ]; then # add a bunch of folders to the list for checkin & checkout. these are # definitely personal, and some of them are fairly dated (the yeti and # hoople folders, for example). - REPOSITORY_LIST+="cloud ebooks web antique inova_codebase yeti gffs/docs gffs/secrets gffs/xsede_tests gffs/code/fred-trunk " + REPOSITORY_LIST+="cloud ebooks web antique inova_codebase yeti gffs/docs gffs/secrets gffs/code/fred-trunk " # point to our local certificate for ssh usage. export SVN_SSH="ssh -i $HOME/.ssh/id_dsa_sourceforge" 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 2bf12787..11bb14e8 100644 --- a/infobase/configuration/cron/run_grid_container_non_work_hours.crontab +++ b/infobase/configuration/cron/run_grid_container_non_work_hours.crontab @@ -5,7 +5,7 @@ SHELL=/bin/bash USER=jurgis -# we need these for the XSEDE and GenesisII environment. +# 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 GENII_USER_DIR=/home/jurgis/.tmp/dot-genesis-xcg3 diff --git a/infobase/configuration/eclipse/dictionary.txt b/infobase/configuration/eclipse/dictionary.txt index 7ea802f3..e202bfe9 100644 --- a/infobase/configuration/eclipse/dictionary.txt +++ b/infobase/configuration/eclipse/dictionary.txt @@ -1,4 +1,6 @@ koeritz xsede +gffs +ems hmmm namespace diff --git a/scripts/archival/zip_xsede.sh b/scripts/archival/zip_gffs.sh similarity index 100% rename from scripts/archival/zip_xsede.sh rename to scripts/archival/zip_gffs.sh diff --git a/scripts/buildor/build_xsedes.sh b/scripts/buildor/gffs_builders.sh similarity index 89% rename from scripts/buildor/build_xsedes.sh rename to scripts/buildor/gffs_builders.sh index 7b53fea5..21dbb59c 100644 --- a/scripts/buildor/build_xsedes.sh +++ b/scripts/buildor/gffs_builders.sh @@ -5,7 +5,7 @@ source "$FEISTY_MEOW_SCRIPTS/core/functions.sh" #hmmm: if this works well, we can use it in lots of places. alias BAIL_ON_FAIL='if [ $? -ne 0 ]; then echo "A problem occurred. $msg"; return 1; fi' -function build_xsede() +function build_gffs() { if [ -z "$GENII_INSTALL_DIR" ]; then echo GENII_INSTALL_DIR is not set. @@ -33,7 +33,7 @@ function build_xsede() success_sound } -function rebuild_xsede() +function rebuild_gffs() { if [ -z "$GENII_INSTALL_DIR" ]; then echo GENII_INSTALL_DIR is not set. @@ -47,14 +47,14 @@ function rebuild_xsede() return 1 fi popd - build_xsede + build_gffs } # a shortcut for doing a new build and creating a bootstrap container with it. function rebu_bootstrap() { - rebuild_xsede - if [ $? -ne 0 ]; then echo "failed to rebuild xsede code"; return 1; fi + 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" if [ ! -f "$quickstarter" ]; then @@ -74,8 +74,8 @@ function rebu_bootstrap() # a shortcut for building without a clean, and creating a bootstrap container with the code. function bu_bootstrap() { - build_xsede - if [ $? -ne 0 ]; then echo "failed to rebuild xsede code"; return 1; fi + 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" if [ ! -f "$quickstarter" ]; then diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh index 5f5725c0..d1b892e0 100644 --- a/scripts/rev_control/version_control.sh +++ b/scripts/rev_control/version_control.sh @@ -3,8 +3,9 @@ # these are helper functions for doing localized revision control. # this script should be sourced into other scripts that use it. +#hmmm: re-address this code, since it doesn't make a lot of sense to me right now... # one unpleasantry to take care of first; cygwin barfs aggressively if the TMP directory -# is a DOS path, but we need it to be a DOS path for our XSEDE testing, so that blows. +# is a DOS path, but we need it to be a DOS path for our GFFS testing, so that blows. # to get past this, TMP gets changed below to a hopefully generic and safe place. if [[ "$TMP" =~ .:.* ]]; then -- 2.34.1