made spacem still show the rename if it was only case based. gffs refresher now...
authorChris Koeritz <fred@gruntose.com>
Tue, 4 Aug 2015 18:01:33 +0000 (14:01 -0400)
committerChris Koeritz <fred@gruntose.com>
Tue, 4 Aug 2015 18:01:33 +0000 (14:01 -0400)
scripts/buildor/refresh_gffs_build.sh
scripts/core/functions.sh

index 8fd9e0f9dce105b0b490ba91914e18828852b023..8976eaf84737ec5aec6f63106bc8d45363eb2597 100644 (file)
@@ -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 
index 535f5ecdaa1c2df8c79aa61ff637f6d5e865bd83..ed5d19193c1f6eb5c7ecde332161d109f7e1a4c1 100644 (file)
@@ -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.