X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Flaunch_feisty_meow.sh;h=b5a7b2f0d8291294c19679bd14b369cf14ab3c3c;hb=fcbc81df5d7a6ef433ba7ea567b7e38a4424f946;hp=d7bbe30f761fdb33a3e4946c9fc7631cc64e919f;hpb=f9a2a21830b0ea5f803c17cae56573a6b18e43db;p=feisty_meow.git diff --git a/scripts/core/launch_feisty_meow.sh b/scripts/core/launch_feisty_meow.sh index d7bbe30f..b5a7b2f0 100644 --- a/scripts/core/launch_feisty_meow.sh +++ b/scripts/core/launch_feisty_meow.sh @@ -18,6 +18,13 @@ ############## +# patch the user variable if we were launched by one of our cron jobs. +if [ -z "$USER" -a ! -z "$CRONUSER" ]; then + export USER="$CRONUSER" +fi + +############## + export ERROR_OCCURRED= # there have been no errors to start with, at least. we will set this # to non-empty if something bad happens. @@ -46,7 +53,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 +62,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,27 +99,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 - # a minor tickle of the title of the terminal, unless we already have some history. - if ptt_stack_empty; then - label_terminal_with_info - fi +#echo before the new labelling, terminal titles have: +#show_terminal_titles - if [ ! -z "$SHELL_DEBUG" ]; then echo "heavyweight init is done."; fi -fi +# 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 if [ -z "$ERROR_OCCURRED" ]; then # set a sentinel variable to say we loaded the feisty meow environment.