X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Fbootstrap_shells.sh;h=3d1288891dda0d75d2f915d411ad89a7e33c847d;hb=6c098e82fd059487b6097d31cdf8e199de7d792e;hp=a3df21a6da8c3140dd1dec2e23c1beaac3f25701;hpb=2952ccf47b80174880141a7ecfa122089f349b8d;p=feisty_meow.git

diff --git a/scripts/core/bootstrap_shells.sh b/scripts/core/bootstrap_shells.sh
index a3df21a6..3d128889 100644
--- a/scripts/core/bootstrap_shells.sh
+++ b/scripts/core/bootstrap_shells.sh
@@ -9,49 +9,43 @@
 # shell startup.  that can be added manually by editing your .bashrc file.
 # read the examples/bashrc_user file for more details.
 
-YETI_CORE_SCRIPTS_DIR="$(dirname "$0" | tr '\\\\' '/' )"
+ORIGINATING_FOLDER="$( \cd "$(\dirname "$0")" && \pwd )"
+YETI_CORE_SCRIPTS_DIR="$(echo "$ORIGINATING_FOLDER" | tr '\\\\' '/' )"
 THIS_TOOL_NAME="$(basename "$0")"
 
-# check this scripts directory; do we find this script there?
-pushd "/" &>/dev/null  # jump to root so relative paths have to fail.
-if [ ! -f "$YETI_CORE_SCRIPTS_DIR/$THIS_TOOL_NAME" ]; then
-  echo "This script must be run using its full pathname.  This enables the script to"
-  echo "locate the proper folders.  Please try again with the full path, e.g.:"
-  echo "    bash /home/fred/codeplex/$THIS_TOOL_NAME"
-  exit 1
-fi
-popd &>/dev/null
-
-# set up the yeti dir if it's not already defined.
+# set up the feisty_meow dir.
 pushd "$YETI_CORE_SCRIPTS_DIR/../.." &>/dev/null
-export YETI_DIR="$(pwd)"
+export FEISTY_MEOW_DIR="$(pwd)"
 popd &>/dev/null
-#echo yeti is $YETI_DIR
 
-export YETI_SCRIPTS="$YETI_DIR/scripts"
-export SHELLDIR="$YETI_SCRIPTS"
+export FEISTY_MEOW_SCRIPTS="$FEISTY_MEOW_DIR/scripts"
 
-# GENERADIR is where the generated files yeti uses are located.
-export GENERADIR="$HOME/.zz_auto_gen"
+# 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 GENERADIR="$TMP/zz_auto_gen"
+  export FEISTY_MEOW_GENERATED="$TMP/zz_auto_gen"
+fi
+if [ ! -d "$FEISTY_MEOW_GENERATED" ]; then
+  mkdir "$FEISTY_MEOW_GENERATED"
 fi
-if [ ! -d "$GENERADIR" ]; then
-  mkdir "$GENERADIR"
+if [ ! -d "$FEISTY_MEOW_GENERATED/custom" ]; then
+  mkdir "$FEISTY_MEOW_GENERATED/custom"
 fi
 
-YETIVARS="$GENERADIR/yeti_variables.sh"
-echo >"$YETIVARS"
-for i in YETI_DIR YETI_SCRIPTS SHELLDIR GENERADIR; do
-  echo "export $i=${!i}" >>"$YETIVARS"
+# just a variable we use in here to refer to the generated variables file.
+GENERATED_FEISTY_MEOW_VARIABLES="$FEISTY_MEOW_GENERATED/fmc_variables.sh"
+# create the alias file as totally blank.
+echo -n >"$GENERATED_FEISTY_MEOW_VARIABLES"
+for i in FEISTY_MEOW_DIR FEISTY_MEOW_SCRIPTS FEISTY_MEOW_GENERATED; do
+  echo "export $i=${!i}" >>"$GENERATED_FEISTY_MEOW_VARIABLES"
 done
 
 # create our common aliases.
-perl "$YETI_SCRIPTS/core/generate_aliases.pl"
+perl "$FEISTY_MEOW_SCRIPTS/core/generate_aliases.pl"
 
-echo -e '\n\n'
-echo Established this set of variables to describe how to find yeti assets:
-cat "$YETIVARS"
-echo -e '\n'
+echo ==========================================
+echo Established this set of variables to describe how to find feisty_meow assets:
+cat "$GENERATED_FEISTY_MEOW_VARIABLES"
+echo ==========================================