X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Flaunch_feisty_meow.sh;h=9e818341eec7d760db4755824f029df06f53b386;hb=63ea779000a06dd59febb62501f0e97812037a31;hp=38c304c0eff468655ded620a980695feea872b6c;hpb=5e68f23f6769118cb875beb662a41f4fb6b5c27e;p=feisty_meow.git

diff --git a/scripts/core/launch_feisty_meow.sh b/scripts/core/launch_feisty_meow.sh
index 38c304c0..9e818341 100644
--- a/scripts/core/launch_feisty_meow.sh
+++ b/scripts/core/launch_feisty_meow.sh
@@ -10,28 +10,43 @@
 
 ##############
 
+# SHELL_DEBUG: if this variable is non-empty, then it causes the feisty meow
+# scripts to print more diagnostic information when they run.  not all
+# scripts support this, but the core ones do.
+
 #export SHELL_DEBUG=true
-  # this variable causes the scripts that listen to it to print more information
-  # when they run.
 
-export ERROR_OCCURRED=
-  # no error to start with.
+##############
+
+# some preconditions we want to establish before loading anything...
+
+# make sure that aliases can be used in non-interactive shells.
+shopt -s expand_aliases
+
+# 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
 
 ##############
 
-if [ -z "$FEISTY_MEOW_GENERATED" ]; then
-  # FEISTY_MEOW_GENERATED is where the generated files yeti uses are located.
+export ERROR_OCCURRED=
+  # there have been no errors to start with, at least.  we will set this
+  # to non-empty if something bad happens.
+
+if [ -z "$FEISTY_MEOW_LOADING_DOCK" ]; then
+  # FEISTY_MEOW_LOADING_DOCK is where the generated files are located.
   # 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"
+  export FEISTY_MEOW_LOADING_DOCK="$HOME/.zz_feisty_loading"
 #hmmm: the above is kind of a constant.  that's not so great.
 
   # make sure our main variables are established.
-  GENERATED_FEISTY_MEOW_VARIABLES="$FEISTY_MEOW_GENERATED/fmc_variables.sh"
-  if [ ! -f "$GENERATED_FEISTY_MEOW_VARIABLES" ]; then
+  FEISTY_MEOW_VARIABLES_LOADING_FILE="$FEISTY_MEOW_LOADING_DOCK/fmc_variables.sh"
+  if [ ! -f "$FEISTY_MEOW_VARIABLES_LOADING_FILE" ]; then
     echo -e '\n\n'
-    echo "The yeti scripts need to be initialized via the bootstrap process, e.g.:"
-    echo "  bash $HOME/feisty_meow/scripts/core/bootstrap_shells.sh"
+    echo "Feisty meow scripts need initialization via the bootstrap process, e.g.:"
+    echo "  bash $HOME/feisty_meow/scripts/core/reconfigure_feisty_meow.sh"
     echo -e '\n\n'
     ERROR_OCCURRED=true
   fi
@@ -40,10 +55,10 @@ if [ -z "$FEISTY_MEOW_GENERATED" ]; then
 
   # pull in our generated variables that are the minimal set we need to find
   # the rest of our resources.
-  source "$GENERATED_FEISTY_MEOW_VARIABLES"
+  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
 
@@ -52,24 +67,26 @@ 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"
 
 ##############
   
 # include helpful functions.  we do this every time rather than making it part
 # of variable initialization, because functions cannot be exported to
-# sub-shells in bash (much like aliases cannot, to our infinite chagrin after
-# having migrated from korn shell...).
+# sub-shells in bash.
 source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"
   
+# load some helper methods for the terminal which we'll use below.
+source "$FEISTY_MEOW_SCRIPTS/tty/terminal_titler.sh"
+
 ##############
   
 # check hash table before searching path.
 shopt -s checkhash
 # don't check path for sourced files.
 shopt -u sourcepath
-# ignore duplicate lines and spaces for history.
-HISTCONTROL=ignoredups:ignorespace
+# ignore duplicate lines.
+HISTCONTROL=ignoredups
 # append to the history file.
 shopt -s histappend
 # automatically update window size if needed.
@@ -77,33 +94,35 @@ shopt -s checkwinsize
 
 ##############
 
-if [ -z "$LIGHTWEIGHT_INIT" ]; then
-  # perform the bulkier parts of the login and initialization.
+# make history writes immediate to avoid losing history if bash is zapped.
+echo $PROMPT_COMMAND | grep -q history
+if [ $? -ne 0 ]; then
+  # we only change the prompt command if we think it hasn't already been done.
+  export PROMPT_COMMAND="history -a;$PROMPT_COMMAND"
+fi
 
-  if [ ! -z "$SHELL_DEBUG" ]; then echo heavyweight login begins...; fi
+##############
 
-  # set up the aliases for the shell, but only if they are not already set.
-  alias regenerate &>/dev/null  # see if a crucial alias exists.
-  if [ $? -ne 0 ]; then
-    if [ ! -z "$SHELL_DEBUG" ]; then
-      echo the aliases were missing, now they are added...
-    fi
-    source "$FEISTY_MEOW_GENERATED/fmc_core_and_custom_aliases.sh"
-  fi
+# perform the bulkier parts of the initialization process.
 
-  # allow connections to our x server from the local host.
-  if [ ! -z "$DISPLAY" ]; then
-    if [ ! -z "$(echo "$OS_TYPE" | grep -i darwin)" ]; then
-      if [ ! -z "$SHELL_DEBUG" ]; then echo Enabling localhost X connections...; fi
-      xhost + localhost >/dev/null 2>&1
-    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"
+fi
 
-  # a minor tickle of the title of the terminal, in case there is one.
-  bash $FEISTY_MEOW_SCRIPTS/tty/label_terminal_with_infos.sh
+#echo before the new labelling, terminal titles have:
+#show_terminal_titles
 
-  if [ ! -z "$SHELL_DEBUG" ]; then echo heavyweight login ends....; 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.