X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Fbootstrap_shells.sh;h=fd86f50e7d80c945b23b99cd5e31330fb25c65d4;hb=50a952e23d8fa60213b272b55309b633b923fa11;hp=7dba79d4315ace93653a6eb923cbc001bafcfc59;hpb=2cfa5f43da6854d5011dc05e34adb4f8d36c14a7;p=feisty_meow.git

diff --git a/scripts/core/bootstrap_shells.sh b/scripts/core/bootstrap_shells.sh
index 7dba79d4..fd86f50e 100644
--- a/scripts/core/bootstrap_shells.sh
+++ b/scripts/core/bootstrap_shells.sh
@@ -3,19 +3,33 @@
 # 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
-export FEISTY_MEOW_DIR="$(pwd)"
+pushd "$CORE_SCRIPTS_DIR/../.." &>/dev/null
+source "$CORE_SCRIPTS_DIR/functions.sh"
+
+export FEISTY_MEOW_DIR="$(\pwd)"
+
+# repetitive bit stolen from variables.  should make a file out of this somehow.
+IS_DOS=$(uname | grep -i ming)
+if [ -z "$IS_DOS" ]; then IS_DOS=$(uname | grep -i cygwin); fi
+# now if we're stuck in DOS, then fix the feisty meow variable name.
+if [ ! -z "$IS_DOS" ]; then
+  FEISTY_MEOW_DIR="$(cmd /c chdir | tr A-Z a-z | sed -e 's/\\/\//g')"
+echo feisty meow dos is: $FEISTY_MEOW_DIR
+  FEISTY_MEOW_DIR="$(dos_to_unix_path "$FEISTY_MEOW_DIR")"
+echo new feisty meow fixed dir is: $FEISTY_MEOW_DIR
+fi
+
 popd &>/dev/null
 
 export FEISTY_MEOW_SCRIPTS="$FEISTY_MEOW_DIR/scripts"
@@ -39,7 +53,7 @@ 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.
+# load our variables so we can run our perl scripts successfully.
 source "$FEISTY_MEOW_SCRIPTS/core/variables.sh"
 
 # create our common aliases.