X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Fbootstrap_shells.sh;h=ded1cf9ac23427b48828db7daa50961a8e05ea4a;hb=3c7b6af77b25472348eb14947cd7d7040eba489d;hp=f19855e89f9cb461fc9a4e4eb0ba9b92eb6eac24;hpb=764dc9a5884fe4c21587c4377a0a590a08770250;p=feisty_meow.git diff --git a/scripts/core/bootstrap_shells.sh b/scripts/core/bootstrap_shells.sh index f19855e8..ded1cf9a 100644 --- a/scripts/core/bootstrap_shells.sh +++ b/scripts/core/bootstrap_shells.sh @@ -22,13 +22,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 +39,14 @@ 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: +echo established these variables for feisty_meow assets: +echo ============== cat "$GENERATED_FEISTY_MEOW_VARIABLES" -echo ========================================== +echo ==============