X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Fbootstrap_shells.sh;h=fd86f50e7d80c945b23b99cd5e31330fb25c65d4;hb=c72b7521e60f5ca7d2873271767c7ff4fba09bf2;hp=a4031bcaf37bb5176674de6da9727a69f456c1dd;hpb=223b6d85cccfb8582f7fa610a9cb482284abad49;p=feisty_meow.git diff --git a/scripts/core/bootstrap_shells.sh b/scripts/core/bootstrap_shells.sh index a4031bca..fd86f50e 100644 --- a/scripts/core/bootstrap_shells.sh +++ b/scripts/core/bootstrap_shells.sh @@ -15,7 +15,21 @@ THIS_TOOL_NAME="$(basename "$0")" # set up the feisty_meow dir. pushd "$CORE_SCRIPTS_DIR/../.." &>/dev/null -export FEISTY_MEOW_DIR="$(pwd)" +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.