X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Flaunch_feisty_meow.sh;h=db00c382eafa22b1c5005bc96ae00ab02d8b18b3;hb=4cfdd08aaad4926a3133d96076d3e4cae78adb3a;hp=fbd999bb714ecaba45ce705f5160ca4fd72d8b59;hpb=5b41556156a8c6c4fb4b15d0c6b03095a48d0211;p=feisty_meow.git diff --git a/scripts/core/launch_feisty_meow.sh b/scripts/core/launch_feisty_meow.sh index fbd999bb..db00c382 100644 --- a/scripts/core/launch_feisty_meow.sh +++ b/scripts/core/launch_feisty_meow.sh @@ -46,7 +46,7 @@ if [ -z "$FEISTY_MEOW_LOADING_DOCK" ]; then source "$FEISTY_MEOW_VARIABLES_LOADING_FILE" # Set up the temporary directory. - source $FEISTY_MEOW_SCRIPTS/core/create_tempdir.sh + source "$FEISTY_MEOW_SCRIPTS/core/create_tempdir.sh" fi @@ -55,7 +55,7 @@ fi # 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 +source "$FEISTY_MEOW_SCRIPTS/core/variables.sh" ############## @@ -92,28 +92,26 @@ fi ############## -if [ -z "$LIGHTWEIGHT_INIT" ]; then - # perform the bulkier parts of the initialization process. +# perform the bulkier parts of the initialization process. - if [ ! -z "$SHELL_DEBUG" ]; then echo "heavyweight init begins..."; fi +if [ ! -z "$SHELL_DEBUG" ]; then echo "heavyweight init begins..."; fi - # set up the aliases for the shell, but only if they are not already set. - type CORE_ALIASES_LOADED &>/dev/null - if [ $? -ne 0 ]; then - if [ ! -z "$SHELL_DEBUG" ]; then - echo "the aliases were missing, now they are being added..." - fi - source "$FEISTY_MEOW_LOADING_DOCK/fmc_core_and_custom_aliases.sh" +# set up the aliases for the shell, but only if they are not already set. +type CORE_ALIASES_LOADED &>/dev/null +if [ $? -ne 0 ]; then + if [ ! -z "$SHELL_DEBUG" ]; then + echo "the aliases were missing, now they are being added..." fi + source "$FEISTY_MEOW_LOADING_DOCK/fmc_core_and_custom_aliases.sh" +fi #echo before the new labelling, terminal titles have: #show_terminal_titles - # a minor tickle of the title of the terminal, unless we already have some history. - label_terminal_with_info +# a minor tickle of the title of the terminal, unless we already have some history. +label_terminal_with_info - if [ ! -z "$SHELL_DEBUG" ]; then echo "heavyweight init is done."; fi -fi +if [ ! -z "$SHELL_DEBUG" ]; then echo "heavyweight init is done."; fi if [ -z "$ERROR_OCCURRED" ]; then # set a sentinel variable to say we loaded the feisty meow environment.