updated to get closer to building using cygwin, which is difficult because

[feisty_meow.git] / scripts / core / bootstrap_shells.sh

diff --git a/scripts/core/bootstrap_shells.sh b/scripts/core/bootstrap_shells.sh
index f19855e89f9cb461fc9a4e4eb0ba9b92eb6eac24..0f7ad4a68bf4910d0a1c1b98550716fa0619e764 100644 (file)
--- a/scripts/core/bootstrap_shells.sh
+++ b/scripts/core/bootstrap_shells.sh
@@ -3,18 +3,19 @@
 # bootstrap_shells:
 #
 # This script creates the directory for auto-generated scripts and gets
-# the current user's account ready to use YETI.
+# the current user's account ready to use the feisty meow scripts.
 #
-# Note: this does not yet ensure that the YETI profile is executed on
-# shell startup.  that can be added manually by editing your .bashrc file.
+# Note: this does not yet ensure that the profile is executed on shell
+# startup.  that can be added manually by editing your .bashrc file.
 # read the examples/feisty_meow_startup/bashrc_user file for more details.
 
 ORIGINATING_FOLDER="$( \cd "$(\dirname "$0")" && \pwd )"
-YETI_CORE_SCRIPTS_DIR="$(echo "$ORIGINATING_FOLDER" | tr '\\\\' '/' )"
+CORE_SCRIPTS_DIR="$(echo "$ORIGINATING_FOLDER" | tr '\\\\' '/' )"
 THIS_TOOL_NAME="$(basename "$0")"
 
 # set up the feisty_meow dir.
-pushd "$YETI_CORE_SCRIPTS_DIR/../.." &>/dev/null
+pushd "$CORE_SCRIPTS_DIR/../.." &>/dev/null
+source "$CORE_SCRIPTS_DIR/functions.sh"
 export FEISTY_MEOW_DIR="$(pwd)"
 popd &>/dev/null
 
@@ -22,13 +23,11 @@ export FEISTY_MEOW_SCRIPTS="$FEISTY_MEOW_DIR/scripts"
 
 # FEISTY_MEOW_GENERATED is where the generated files feisty_meow uses are located.
 export FEISTY_MEOW_GENERATED="$HOME/.zz_auto_gen"
-if [ ! -z "$WINDIR" -o ! -z "$windir" ]; then
-  # assume they are using windoze.
-  export FEISTY_MEOW_GENERATED="$TMP/zz_auto_gen"
-fi
 if [ ! -d "$FEISTY_MEOW_GENERATED" ]; then
   mkdir "$FEISTY_MEOW_GENERATED"
 fi
+# make toast out of generated files right away, but leave any custom scripts.
+find "$FEISTY_MEOW_GENERATED" -maxdepth 1 -type f -exec rm -f "{}" ';' &>/dev/null
 if [ ! -d "$FEISTY_MEOW_GENERATED/custom" ]; then
   mkdir "$FEISTY_MEOW_GENERATED/custom"
 fi
@@ -41,11 +40,16 @@ for i in FEISTY_MEOW_DIR FEISTY_MEOW_SCRIPTS FEISTY_MEOW_GENERATED; do
   echo "export $i=${!i}" >>"$GENERATED_FEISTY_MEOW_VARIABLES"
 done
 
+# load our variables so we get a useful PERLLIB variable.
+source "$FEISTY_MEOW_SCRIPTS/core/variables.sh"
+
 # create our common aliases.
 perl "$FEISTY_MEOW_SCRIPTS/core/generate_aliases.pl"
 
-echo ==========================================
-echo Established this set of variables to describe how to find feisty_meow assets:
-cat "$GENERATED_FEISTY_MEOW_VARIABLES"
-echo ==========================================
+if [ ! -z "$SHELL_DEBUG" ]; then
+  echo established these variables for feisty_meow assets:
+  echo ==============
+  cat "$GENERATED_FEISTY_MEOW_VARIABLES"
+  echo ==============
+fi