adopted two new variables
authorChris Koeritz <fred@gruntose.com>
Sun, 5 Nov 2017 00:57:44 +0000 (20:57 -0400)
committerChris Koeritz <fred@gruntose.com>
Sun, 5 Nov 2017 00:57:44 +0000 (20:57 -0400)
SHELL_DEBUG => DEBUG_FEISTY_MEOW
GENERATED_STORE => FEISTY_MEOW_GENERATED_STORE

20 files changed:
examples/bashisms/dot.bash_logout
feisty_inits/dot.bashrc-normal-user
nucleus/library/tests_filesystem/test_directory_tree.cpp
production/paths.ini
scripts/clam/variables.def
scripts/core/common.alias
scripts/core/create_tempdir.sh
scripts/core/functions.sh
scripts/core/generate_aliases.pl
scripts/core/launch_feisty_meow.sh
scripts/core/reconfigure_feisty_meow.sh
scripts/core/variables.sh
scripts/customize/fred/java_profile.sh
scripts/files/safedel.pl
scripts/generator/build_variables.sh
scripts/generator/minimize_feisty_meow.sh
scripts/generator/produce_feisty_meow.sh
scripts/generator/whack_build.sh
scripts/generator/wrapdoze.sh
scripts/rev_control/getem.sh

index ad844beab9da7dcf91e5de4a1f0f30fbd59b97cd..ab2ba32b3d23ea47a67f9ba0f825b8b352d69fa2 100644 (file)
@@ -1,6 +1,6 @@
 # runs the nechung oracle program at exit from bash.
 
 sep 79
-$GENERATED_STORE/runtime/binaries/nechung 
+$FEISTY_MEOW_GENERATED_STORE/runtime/binaries/nechung 
 echo
 
index 793e4841f8eeb3c2f3a221a727777838637c8f3f..aace71cfe6fad95939d48c63692accb2d36b6015 100644 (file)
@@ -25,7 +25,7 @@ if [ "${TERM}" != "dumb" -a -z "$PBS_ENVIRONMENT" ]; then
   export RUN_ALL_TESTS=true
 
   # turns on noisy debugging in feisty meow scripts if uncommented.
-  #export SHELL_DEBUG=true
+  #export DEBUG_FEISTY_MEOW=true
 fi
 
 ##############
index 77b32a3737b362446b325a407c4332e1cc595567..5e9fe6b3426c93d754c8695d115f915745f6bc6f 100644 (file)
@@ -197,7 +197,7 @@ LOG(diffs.text_form());
 LOG("reading tree to recreate");
     directory_tree dir(path, pattern.s());
     ASSERT_TRUE(dir.good(), "makedirs test directory reading");
-    filename tmpdir(environment::get("GENERATED_STORE") + "/zz_balfazzaral");
+    filename tmpdir(environment::get("FEISTY_MEOW_GENERATED_STORE") + "/zz_balfazzaral");
     LOG(astring("will write to tmp in ") + tmpdir);
     basis::outcome result = dir.make_directories(tmpdir.raw());
     ASSERT_EQUAL(result.value(), common::OKAY, "makedirs should succeed");
index c9ee4edc8b8d1834a2c47d1437be3299f9857736..0f27437005f626490677a69e630b0bc1fc0b0cd5 100644 (file)
@@ -1,3 +1,3 @@
 [Common]
-LogPath=$GENERATED_STORE/logs
+LogPath=$FEISTY_MEOW_GENERATED_STORE/logs
 
index 100fe6bef38c3b81b32ba172ba3f6c47b4a26803..809f79e592ff001b606acf47d5edd875fe88b481 100644 (file)
@@ -198,7 +198,7 @@ export CLEAN
 # sets the temporary directory.
 export CLAM_TMP
 ifeq "$(CLAM_TMP)" ""
-  CLAM_TMP := $(GENERATED_STORE)/clam_tmp
+  CLAM_TMP := $(FEISTY_MEOW_GENERATED_STORE)/clam_tmp
 endif
 
 #turned off for the moment, since this seems like a bad idea; we define clam tmp in terms of tmp sometimes, do not we???
index 1a70699ef50cd91ee071063ee3c0cf2f070f9422..bb3f4a5a6ab4faed5c6d8bf1cb9b0c707555c00e 100644 (file)
@@ -104,9 +104,9 @@ define_yeti_alias why='echo We all wonder what the point of the universe is at t
 
 # call the generated aliases file, if it exists.
 if [ -f "$FEISTY_MEOW_LOADING_DOCK/fmc_aliases_for_scripts.sh" ]; then 
-  if [ ! -z "$SHELL_DEBUG" ]; then echo loading script aliases...; fi
+  if [ ! -z "$DEBUG_FEISTY_MEOW" ]; then echo loading script aliases...; fi
   source "$FEISTY_MEOW_LOADING_DOCK/fmc_aliases_for_scripts.sh"
-  if [ ! -z "$SHELL_DEBUG" ]; then echo done loading script aliases.; fi
+  if [ ! -z "$DEBUG_FEISTY_MEOW" ]; then echo done loading script aliases.; fi
 fi
 
 ##############
index e4fd53d62b96d2910c0eb355e85f510c6b810b04..6dbd31c3415ea797a493d58e92004d57b60ff8c0 100644 (file)
@@ -5,7 +5,7 @@
 # This creates a temporary directory for transient files if such a directory
 # does not already exist.
 
-if [ ! -z "$SHELL_DEBUG" ]; then echo creating temporary directory...; fi
+if [ ! -z "$DEBUG_FEISTY_MEOW" ]; then echo creating temporary directory...; fi
 
 if [ -z "$TMP" ]; then
   # main declaration of the transients area.
@@ -34,5 +34,5 @@ export TEMP=$TMP
 # Make sure no one else is playing around in the temporary directory.
 chmod 700 $TMP
 
-if [ ! -z "$SHELL_DEBUG" ]; then echo done creating temporary directory....; fi
+if [ ! -z "$DEBUG_FEISTY_MEOW" ]; then echo done creating temporary directory....; fi
 
index fbdf0ac885f83365e7657705b0a445bf02880b0a..6c8bc68ad64e13b805ad1fc326f536558ae2b980 100644 (file)
@@ -11,7 +11,7 @@ skip_all=
 type function_sentinel &>/dev/null
 if [ $? -eq 0 ]; then
   # there was no error, so we can skip the inits.
-  if [ ! -z "$SHELL_DEBUG" ]; then
+  if [ ! -z "$DEBUG_FEISTY_MEOW" ]; then
     echo "skipping function definitions, because already defined."
   fi
   skip_all=yes
@@ -21,7 +21,7 @@ fi
 
 if [ -z "$skip_all" ]; then
 
-  if [ ! -z "$SHELL_DEBUG" ]; then
+  if [ ! -z "$DEBUG_FEISTY_MEOW" ]; then
     echo "feisty meow function definitions beginning now..."
   fi
 
@@ -742,7 +742,7 @@ return 0
     return 0; 
   }
   
-  if [ ! -z "$SHELL_DEBUG" ]; then echo "feisty meow function definitions done."; fi
+  if [ ! -z "$DEBUG_FEISTY_MEOW" ]; then echo "feisty meow function definitions done."; fi
 
   ##############
 
index 50e4bd5676780b0c0868382f63fd0671c2187962..2f87acc009d346275454980d89611a8b06db34b1 100644 (file)
@@ -23,7 +23,7 @@
 
 require "filename_helper.pl";
 
-use Env qw(FEISTY_MEOW_BINARIES BUILD_TOP FEISTY_MEOW_APEX FEISTY_MEOW_LOADING_DOCK FEISTY_MEOW_SCRIPTS SHELL_DEBUG );
+use Env qw(FEISTY_MEOW_BINARIES BUILD_TOP FEISTY_MEOW_APEX FEISTY_MEOW_LOADING_DOCK FEISTY_MEOW_SCRIPTS DEBUG_FEISTY_MEOW );
 
 # given a possible aliasable filename, this will decide whether to create a perl
 # or bash alias for it.  it needs the filename of the possible alias and the
@@ -78,14 +78,14 @@ sub load_file_names {
 # loaded also.
 sub rebuild_script_aliases {
 
-  if (length($SHELL_DEBUG)) {
+  if (length($DEBUG_FEISTY_MEOW)) {
     print "rebuilding generated aliases file...\n";
   }
 
   # create our generated shells directory if it's not already.
   if ( ! -d $FEISTY_MEOW_LOADING_DOCK ) {
     mkdir $FEISTY_MEOW_LOADING_DOCK;
-    if (length($SHELL_DEBUG)) {
+    if (length($DEBUG_FEISTY_MEOW)) {
       print "made FEISTY_MEOW_LOADING_DOCK at '$FEISTY_MEOW_LOADING_DOCK'\n";
     }
   }
@@ -100,7 +100,7 @@ sub rebuild_script_aliases {
   foreach $i (&glob_list("$FEISTY_MEOW_LOADING_DOCK/custom/*.alias")) {
     if (-f $i) { push(@ALIAS_DEFINITION_FILES, $i); }
   }
-  if (length($SHELL_DEBUG)) {
+  if (length($DEBUG_FEISTY_MEOW)) {
     print "using these alias files:\n";
     foreach $i (@ALIAS_DEFINITION_FILES) {
       local $base_of_dir = &basename(&dirname($i));
@@ -112,7 +112,7 @@ sub rebuild_script_aliases {
   # write the aliases for sh and bash scripts.
 
   local $GENERATED_ALIAS_FILE = "$FEISTY_MEOW_LOADING_DOCK/fmc_core_and_custom_aliases.sh";
-  if (length($SHELL_DEBUG)) {
+  if (length($DEBUG_FEISTY_MEOW)) {
     print "writing generated aliases in $GENERATED_ALIAS_FILE...\n";
   }
 
@@ -142,7 +142,7 @@ sub rebuild_script_aliases {
 
   close GENOUT;
 
-  if (length($SHELL_DEBUG)) {
+  if (length($DEBUG_FEISTY_MEOW)) {
     print("done rebuilding generated aliases file.\n");
   }
 }
@@ -184,7 +184,7 @@ if (-d $FEISTY_MEOW_BINARIES) {
 # trash the old versions.
 unlink("$FEISTY_MEOW_LOADING_DOCK/fmc_aliases_for_scripts.sh");
 
-if (length($SHELL_DEBUG)) {
+if (length($DEBUG_FEISTY_MEOW)) {
   printf "writing $FEISTY_MEOW_LOADING_DOCK/fmc_aliases_for_scripts.sh...\n";
 }
 
index b9ba1d72979fa2818e23aab1698eb07f5e7bf29f..040f2ff33c4cfed41258ecae86e4171228890a79 100644 (file)
 
 ##############
 
-# SHELL_DEBUG: if this variable is non-empty, then it causes the feisty meow
+# DEBUG_FEISTY_MEOW: if this variable is non-empty, then it causes the feisty meow
 # scripts to print more diagnostic information when they run.  not all
 # scripts support this, but the core ones do.
 
-#export SHELL_DEBUG=true
+#export DEBUG_FEISTY_MEOW=true
 
 ##############
 
@@ -120,12 +120,12 @@ if [ -z "$ERROR_OCCURRED" ]; then
   
   # perform the bulkier parts of the initialization process.
   
-  if [ ! -z "$SHELL_DEBUG" ]; then echo "heavyweight init begins..."; fi
+  if [ ! -z "$DEBUG_FEISTY_MEOW" ]; then echo "heavyweight init begins..."; fi
   
   # set up the aliases for the shell, but only if they are not already set.
   type CORE_ALIASES_LOADED &>/dev/null
   if [ $? -ne 0 ]; then
-    if [ ! -z "$SHELL_DEBUG" ]; then
+    if [ ! -z "$DEBUG_FEISTY_MEOW" ]; then
       echo "the aliases were missing, now they are being added..."
     fi
     source "$FEISTY_MEOW_LOADING_DOCK/fmc_core_and_custom_aliases.sh"
@@ -137,7 +137,7 @@ if [ -z "$ERROR_OCCURRED" ]; then
   # a minor tickle of the title of the terminal, unless we already have some history.
   label_terminal_with_info
   
-  if [ ! -z "$SHELL_DEBUG" ]; then echo "heavyweight init is done."; fi
+  if [ ! -z "$DEBUG_FEISTY_MEOW" ]; then echo "heavyweight init is done."; fi
   
   if [ -z "$ERROR_OCCURRED" ]; then
     # set a sentinel variable to say we loaded the feisty meow environment.
index e44d017c2042e53873b2b4f181f4e7c656d0f6ce..dad26d1477cbdd79d404d90ca38673bd1de55e68 100644 (file)
@@ -64,7 +64,7 @@ source "$FEISTY_MEOW_SCRIPTS/core/variables.sh"
 # create our common aliases.
 perl "$FEISTY_MEOW_SCRIPTS/core/generate_aliases.pl"
 
-if [ ! -z "$SHELL_DEBUG" ]; then
+if [ ! -z "$DEBUG_FEISTY_MEOW" ]; then
   echo established these variables for feisty_meow assets:
   echo ==============
   cat "$FEISTY_MEOW_VARIABLES_LOADING_FILE"
index 9d84f8cea1e902f2c61b3837e7265e3176861f11..b5ea3456311933b1546fad677f7fca4a623aa9c1 100644 (file)
@@ -51,7 +51,7 @@ define_yeti_variable TERM
 # we'll run this again only if we think it's needed.
 if [ -z "$CORE_VARIABLES_LOADED" ]; then
 
-  if [ ! -z "$SHELL_DEBUG" ]; then echo variables initialization begins...; fi
+  if [ ! -z "$DEBUG_FEISTY_MEOW" ]; then echo variables initialization begins...; fi
   
   ##############
   
@@ -106,15 +106,15 @@ if [ -z "$CORE_VARIABLES_LOADED" ]; then
   fi
 
   # set up the top-level for all build creations and logs and such.
-  if [ -z "$GENERATED_STORE" ]; then
-    define_yeti_variable GENERATED_STORE="$TMP/generated-feisty_meow"
+  if [ -z "$FEISTY_MEOW_GENERATED_STORE" ]; then
+    define_yeti_variable FEISTY_MEOW_GENERATED_STORE="$TMP/generated-feisty_meow"
   fi
-  if [ ! -d "$GENERATED_STORE" ]; then
-    mkdir -p "$GENERATED_STORE"
+  if [ ! -d "$FEISTY_MEOW_GENERATED_STORE" ]; then
+    mkdir -p "$FEISTY_MEOW_GENERATED_STORE"
   fi
   # set up our effluent outsourcing valves.
   if [ -z "$TEMPORARIES_PILE" ]; then
-    define_yeti_variable TEMPORARIES_PILE="$GENERATED_STORE/temporaries"
+    define_yeti_variable TEMPORARIES_PILE="$FEISTY_MEOW_GENERATED_STORE/temporaries"
   fi
   if [ ! -d "$TEMPORARIES_PILE" ]; then
     mkdir -p "$TEMPORARIES_PILE"
@@ -262,7 +262,7 @@ if [ -z "$CORE_VARIABLES_LOADED" ]; then
 
   define_yeti_variable CORE_VARIABLES_LOADED=true
   
-  if [ ! -z "$SHELL_DEBUG" ]; then echo variables initialization ends....; fi
+  if [ ! -z "$DEBUG_FEISTY_MEOW" ]; then echo variables initialization ends....; fi
 fi
 
 ##############
@@ -277,7 +277,7 @@ for i in $FEISTY_MEOW_LOADING_DOCK/custom/*.sh; do
     # skip it if it's not real.
     continue;
   fi
-  if [ ! -z "$SHELL_DEBUG" ]; then
+  if [ ! -z "$DEBUG_FEISTY_MEOW" ]; then
     echo "loading customization: $(basename $(dirname $i))/$(basename $i)"
   fi
   source "$i"
index 672df77d9ec5f5e2705b60bfec01b15cf170edbc..ba26b72ae5f717f844d476558574992b79c92326 100644 (file)
@@ -13,7 +13,7 @@ source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"
 function intuition_failure()
 {
   missing="$1"; shift
-  if [ ! -z "$SHELL_DEBUG" ]; then
+  if [ ! -z "$DEBUG_FEISTY_MEOW" ]; then
     echo "Could not intuit '$missing' variable."
   fi
   # remove the variable because its value is busted.
index b34e852feb770f226f41c1f5ce55bf0f776b3477..ef4ffcb4aa4fb662f6d3e42aa4a7a9a1ed272a98 100644 (file)
@@ -24,7 +24,7 @@ require "filename_helper.pl";
 require "inc_num.pl";
 require "zap_the_dir.pl";
 
-use Env qw(TMP OS SHELL_DEBUG);
+use Env qw(TMP OS DEBUG_FEISTY_MEOW);
 
 #hmmm: need a usage statement.
 
@@ -132,7 +132,7 @@ sub safedel {
     }
   }
   if (@deleted) {
-    if ($SHELL_DEBUG != "") {
+    if ($DEBUG_FEISTY_MEOW != "") {
       print "Trashed [@deleted].\n";
     }
     open(REPORT, ">>$TMP/zz_safedel_report.txt");
index 18f402f7a5e78d308a3587439c67122ffca102ec..3139aac7bc79e113c4184555727dfde002d1f6af 100644 (file)
@@ -80,11 +80,11 @@ else
   # the system is unknown, so we give up on guessing.
   export OPERATING_SYSTEM=unknown
 fi
-if [ ! -z "$SHELL_DEBUG" ]; then
+if [ ! -z "$DEBUG_FEISTY_MEOW" ]; then
   echo "[OS is \"$OPERATING_SYSTEM\"]"
 fi
 
-if [ ! -z "$SHELL_DEBUG" ]; then
+if [ ! -z "$DEBUG_FEISTY_MEOW" ]; then
   echo "[FEISTY_MEOW_APEX is $FEISTY_MEOW_APEX]"
 fi
 
@@ -102,25 +102,25 @@ export BUILD_TOP="$FEISTY_MEOW_APEX"
 export PRODUCTION_STORE="$BUILD_TOP/production"
 
 ## set up the top-level for all build creations and logs and such.
-#export GENERATED_STORE="$TMP/generated-feisty_meow"
-#if [ ! -d "$GENERATED_STORE" ]; then
-#  mkdir -p "$GENERATED_STORE"
+#export FEISTY_MEOW_GENERATED_STORE="$TMP/generated-feisty_meow"
+#if [ ! -d "$FEISTY_MEOW_GENERATED_STORE" ]; then
+#  mkdir -p "$FEISTY_MEOW_GENERATED_STORE"
 #fi
 ## set up our effluent outsourcing valves.
-#export TEMPORARIES_PILE="$GENERATED_STORE/temporaries"
+#export TEMPORARIES_PILE="$FEISTY_MEOW_GENERATED_STORE/temporaries"
 #if [ ! -d "$TEMPORARIES_PILE" ]; then
 #  mkdir -p "$TEMPORARIES_PILE"
 #fi
 
 # this variable points at a folder where we store the generated products of
 # the build, such as the binaries and installer packages.
-export RUNTIME_PATH="$GENERATED_STORE/runtime"
+export RUNTIME_PATH="$FEISTY_MEOW_GENERATED_STORE/runtime"
 if [ ! -d "$RUNTIME_PATH" ]; then
   mkdir -p "$RUNTIME_PATH"
 fi
 
 # we define a log file storage area that can be relied on by the build.
-export FEISTY_MEOW_LOGS="$GENERATED_STORE/logs"
+export FEISTY_MEOW_LOGS="$FEISTY_MEOW_GENERATED_STORE/logs"
 if [ ! -d "$FEISTY_MEOW_LOGS" ]; then
   mkdir -p "$FEISTY_MEOW_LOGS"
 fi
@@ -129,7 +129,7 @@ fi
 
 # debugging area where we say what we think we know.
 
-if [ ! -z "$SHELL_DEBUG" ]; then
+if [ ! -z "$DEBUG_FEISTY_MEOW" ]; then
   echo scripts: $BUILD_SCRIPTS_PATH
   echo build tools hier: $BUILDING_HIERARCHY
   echo this tool: $THIS_TOOL_NAME
index f956ad14c74d1a8723f78e4619ab1df0df715202..3f16cc947b52d876029917b46102a09620a49716 100644 (file)
@@ -9,7 +9,7 @@ source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 sep
 echo "Cleaning up feisty meow generated files..."
 
-pushd $GENERATED_STORE
+pushd $FEISTY_MEOW_GENERATED_STORE
 
 \rm -rf logs clam_tmp temporaries/*
 
index dcac3652eaf55b9409b713abfe6932bd3b9f0735..5b3135d03ee8dc536e3c5f7c4697eec52c70cc49 100644 (file)
@@ -258,7 +258,7 @@ if [ -z "$JUST_BOOTSTRAP_APPS" ]; then
 #wrong!  we don't want to whack it all. clean
 
   # recreate our useful junk directories...
-  mkdir -p "$GENERATED_STORE"
+  mkdir -p "$FEISTY_MEOW_GENERATED_STORE"
   mkdir -p "$TEMPORARIES_PILE"
   mkdir -p "$FEISTY_MEOW_LOGS"
 
index 9051c1a83139de752c4ac36e33ad7fdf755f8f60..b050ca380275cffaccbdb8b09acba400b8d59ad9 100644 (file)
@@ -27,8 +27,8 @@ function whack_single_build_area()
 
   # avoid accidentally removing important stuff if our variables have not been previously
   # established.
-  if [ -z "$GENERATED_STORE" -o -z "$TEMPORARIES_PILE" ]; then
-    echo The build whacking script cannot run because either the GENERATED_STORE
+  if [ -z "$FEISTY_MEOW_GENERATED_STORE" -o -z "$TEMPORARIES_PILE" ]; then
+    echo The build whacking script cannot run because either the FEISTY_MEOW_GENERATED_STORE
     echo variable or the TEMPORARIES_PILE variable have not been set.  This makes
     echo it unsafe to remove anything in the build products.
     exit 1
@@ -37,8 +37,8 @@ function whack_single_build_area()
   # kerzap.  the cleanups in production directory remove older locations of generated files.
   rm -rf \
     "$FEISTY_MEOW_APEX/generatedJUnitFiles" \
-    "$GENERATED_STORE/clam_tmp" \
-    "$GENERATED_STORE/logs" \
+    "$FEISTY_MEOW_GENERATED_STORE/clam_tmp" \
+    "$FEISTY_MEOW_GENERATED_STORE/logs" \
     "$PRODUCTION_STORE/__build_"*.h \
     "$PRODUCTION_STORE/manifest.txt" \
     "$RUNTIME_PATH/binaries" \
index b4ea47f6aea14a3e30aa7ff5b1b4ca1ec764d06f..d38b432b2c229f414f60249099ff3b8d55c0cbba 100755 (executable)
@@ -75,7 +75,7 @@ function dossify_and_run_commands()
     real_commands+=($(echo $i | sed -e 's/\//\\/g'))
   done
 
-  if [ ! -z "$SHELL_DEBUG" ]; then
+  if [ ! -z "$DEBUG_FEISTY_MEOW" ]; then
     echo commands are now:
     for i in "${real_commands[@]}"; do
       echo -n "$i "
index 225ce6987b3e62e3eaa58cd2f30acc0841ca6191..86c9531bf6f07027abed21eae2eccddaa3145ec8 100644 (file)
@@ -12,7 +12,7 @@ source "$FEISTY_MEOW_SCRIPTS/rev_control/version_control.sh"
 # first so we can do an orange-to-orange compare.
 tmpdir="$(cd $TMP; \pwd)"
 if [ "$(\pwd)" != "$tmpdir" ]; then
-  if [ ! -z "$SHELL_DEBUG" ]; then
+  if [ ! -z "$DEBUG_FEISTY_MEOW" ]; then
     echo "moving to the TMP directory to avoid file access conflicts..."
   fi
   new_name="$TMP/zz_$(basename $0)"