X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Flaunch_feisty_meow.sh;h=fc50921c06c3adb2843ef01e9753e77df43f07e5;hb=65a6555c98f82364de0f685582f6d4ef95ad3927;hp=a9db25b406c23e37b5f6275c86f975df640a37c4;hpb=fdcfc633582d7491e7af348ae3b023c5ee83de0b;p=feisty_meow.git diff --git a/scripts/core/launch_feisty_meow.sh b/scripts/core/launch_feisty_meow.sh index a9db25b4..fc50921c 100644 --- a/scripts/core/launch_feisty_meow.sh +++ b/scripts/core/launch_feisty_meow.sh @@ -122,9 +122,8 @@ if [ "$NO_REPAIRS_NEEDED" == "true" ]; then fi ############## - + if [ -z "$ERROR_OCCURRED" ]; then - # pull in our generated variables that are the minimal set we need to find # the rest of our resources. source "$FEISTY_MEOW_VARIABLES_LOADING_FILE" @@ -138,10 +137,9 @@ if [ "$NO_REPAIRS_NEEDED" == "true" ]; then ############## if [ -z "$ERROR_OCCURRED" ]; then - - # load the larger body of standard feisty meow variables into the environment. - # we actually want this to always run also; it will decide what variables need - # to be set again. + # no error occurred in our tests above, so load the larger body of standard feisty + # meow variables into the environment. we actually want this to always run also; + # it will decide what variables need to be set again. source "$FEISTY_MEOW_SCRIPTS/core/variables.sh" ############## @@ -156,6 +154,7 @@ if [ "$NO_REPAIRS_NEEDED" == "true" ]; then ############## +#hmmm: abstract this to a twiddle shell options method. # check hash table before searching path. shopt -s checkhash # don't check path for sourced files. @@ -216,5 +215,8 @@ if [ "$NO_REPAIRS_NEEDED" == "true" ]; then unset FEISTY_MEOW_SHOW_LAUNCH_GREETING fi + # load the last bits we do here. + source "$FEISTY_MEOW_LOADING_DOCK/fmc_ending_sentinel.sh" + fi # "$NO_REPAIRS_NEEDED" was == "true"