X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=scripts%2Fcore%2Fbootstrap_shells.sh;h=7dba79d4315ace93653a6eb923cbc001bafcfc59;hb=e25ac6e59711fa21200845327cafe07a1b4a4f25;hp=75c4fb4a9e2cf786d29f44421e53d5b432c784bd;hpb=65ceb7d51f096b446826c0ab5bdaa9550abab2c3;p=feisty_meow.git diff --git a/scripts/core/bootstrap_shells.sh b/scripts/core/bootstrap_shells.sh index 75c4fb4a..7dba79d4 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,27 +22,33 @@ 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 # just a variable we use in here to refer to the generated variables file. -GENERATED_FEISTY_MEOW_VARIABLES="$FEISTY_MEOW_GENERATED/feisty_meow_variables.sh" +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 +# 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: -cat "$GENERATED_FEISTY_MEOW_VARIABLES" -echo ========================================== +if [ ! -z "$SHELL_DEBUG" ]; then + echo established these variables for feisty_meow assets: + echo ============== + cat "$GENERATED_FEISTY_MEOW_VARIABLES" + echo ============== +fi