X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Fbootstrap_shells.sh;h=6f052e72a952738833feef7661fd3474480c0bcc;hb=8f1a85cd21d35aad6cba6d6929656a112fe002dc;hp=3d1288891dda0d75d2f915d411ad89a7e33c847d;hpb=6c098e82fd059487b6097d31cdf8e199de7d792e;p=feisty_meow.git diff --git a/scripts/core/bootstrap_shells.sh b/scripts/core/bootstrap_shells.sh index 3d128889..6f052e72 100644 --- a/scripts/core/bootstrap_shells.sh +++ b/scripts/core/bootstrap_shells.sh @@ -7,7 +7,7 @@ # # 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. -# read the examples/bashrc_user file for more details. +# 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 '\\\\' '/' )" @@ -22,10 +22,6 @@ 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 @@ -41,6 +37,9 @@ 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"