X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Flaunch_feisty_meow.sh;h=9b1a4e5b34613ba4bdca8e90f895a44b63c80504;hb=8f1a85cd21d35aad6cba6d6929656a112fe002dc;hp=c229bebfb5116bf6b96879e8387ceaa09896dbce;hpb=6c098e82fd059487b6097d31cdf8e199de7d792e;p=feisty_meow.git diff --git a/scripts/core/launch_feisty_meow.sh b/scripts/core/launch_feisty_meow.sh index c229bebf..9b1a4e5b 100644 --- a/scripts/core/launch_feisty_meow.sh +++ b/scripts/core/launch_feisty_meow.sh @@ -20,10 +20,6 @@ # this is our single entry point we can use without knowing any variables # yet in the initialization process. 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 # make sure our main variables are established. GENERATED_FEISTY_MEOW_VARIABLES="$FEISTY_MEOW_GENERATED/fmc_variables.sh" @@ -34,16 +30,18 @@ if [ ! -f "$GENERATED_FEISTY_MEOW_VARIABLES" ]; then echo -e '\n\n' fi -# pull in our variable set. +############## + +# pull in our generated variables that are the minimal set we need to find +# the rest of our resources. source "$GENERATED_FEISTY_MEOW_VARIABLES" ############## -# Set up all of the environment's system variables. This is the first step -# in the majestic plan we have for this shell's initialization. +# load all the standard feisty meow variables into the environment. source $FEISTY_MEOW_SCRIPTS/core/variables.sh -# Set up the temporary directory... +# Set up the temporary directory. source $FEISTY_MEOW_SCRIPTS/core/create_tempdir.sh ############## @@ -65,10 +63,6 @@ if [ -z "$LIGHTWEIGHT_INIT" ]; then if [ ! -z "$SHELL_DEBUG" ]; then echo heavyweight login begins...; fi -#FEISTY_MEOW_GENERATED=$(echo $FEISTY_MEOW_GENERATED | sed -e 's/\\/\//g') -#FEISTY_MEOW_SCRIPTS="$(echo $FEISTY_MEOW_SCRIPTS | sed -e 's/\\/\//g')" -#FEISTY_MEOW_SCRIPTS="$FEISTY_MEOW_SCRIPTS" - # set up the aliases for the shell, but only if they are not already set. alias regenerated &>/dev/null # see if a crucial alias exists. if [ $? -ne 0 ]; then