From d3f90950a4a837077724fbb990b90103202e2bf5 Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Tue, 4 Aug 2015 14:01:33 -0400 Subject: [PATCH] made spacem still show the rename if it was only case based. gffs refresher now cleaning logs up. --- scripts/buildor/refresh_gffs_build.sh | 17 ++++++++++++++--- scripts/core/functions.sh | 6 +++++- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/scripts/buildor/refresh_gffs_build.sh b/scripts/buildor/refresh_gffs_build.sh index 8fd9e0f9..8976eaf8 100644 --- a/scripts/buildor/refresh_gffs_build.sh +++ b/scripts/buildor/refresh_gffs_build.sh @@ -5,12 +5,23 @@ source $FEISTY_MEOW_SCRIPTS/buildor/gffs_builders.sh echo stopping any running genesis processes... bash $XSEDE_TEST_ROOT/library/zap_genesis_javas.sh +export GFFS_LOGS="$HOME/.GenesisII" + +echo cleaning out the logs directory... +\rm -f "$GFFS_LOGS"/*log* + +echo making a simple starting log file for container... +if [ ! -d "$GFFS_LOGS" ]; then + mkdir "$GFFS_LOGS" + check_result Making GFFS logs directory. +fi + echo building the code freshly, although not with a clean first... build_gffs -if [ $? -ne 0 ]; then - echo failed to build the code. -fi +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 & ) +# snooze a bit so the container gets a chance to write something. +sleep 4 tail -f ~/.GenesisII/container.log diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh index 535f5ecd..ed5d1919 100644 --- a/scripts/core/functions.sh +++ b/scripts/core/functions.sh @@ -478,7 +478,11 @@ if [ -z "$skip_all" ]; then # we definitely wanted to adjust the case first, rather than doing all # the wacky stuff this script does to the filename... we will capture # the output of the replace operaton for reporting. - final_name="$(perl "$FEISTY_MEOW_SCRIPTS/files/replace_spaces_with_underscores.sh" "$arg2")" + final_name="$(bash "$FEISTY_MEOW_SCRIPTS/files/replace_spaces_with_underscores.sh" "$arg2")" + if [ -z "$final_name" ]; then + # make sure we report something, if there are no further name changes. + final_name="$arg2" + fi # now zap the intermediate part of the name off. final_name="$(echo $final_name | sed -e 's/.*=> //')" # printout the combined operation results. -- 2.34.1