X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Flaunch_feisty_meow.sh;h=9bbcec146ac265972b2ef78acd169b6d7512e29c;hb=22bbd7c6d7bbb09a5ba955d30ceebf93693d23fb;hp=d6aed1e00ee7d10de54efbdbae35b345b413f0f2;hpb=d3a4525a35121353724f66f57fac2e8b5b0dfca4;p=feisty_meow.git

diff --git a/scripts/core/launch_feisty_meow.sh b/scripts/core/launch_feisty_meow.sh
index d6aed1e0..9bbcec14 100644
--- a/scripts/core/launch_feisty_meow.sh
+++ b/scripts/core/launch_feisty_meow.sh
@@ -10,43 +10,52 @@
 
 ##############
 
-export SHELL_DEBUG=true
-  # this variable causes the scripts that listen to it to print more information
-  # when they run.
+# 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
 
 ##############
 
-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
 
   ##############
 
   # 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
 
-  ##############
+fi
 
-  # load the larger body of standard feisty meow variables into the environment.
-  source $FEISTY_MEOW_SCRIPTS/core/variables.sh
+##############
 
-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
 
 ##############
   
@@ -62,34 +71,56 @@ source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"
 shopt -s checkhash
 # don't check path for sourced files.
 shopt -u sourcepath
+# ignore duplicate lines.
+HISTCONTROL=ignoredups
+# append to the history file.
+shopt -s histappend
+# automatically update window size if needed.
+shopt -s checkwinsize
+
+##############
+
+# 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 "$LIGHTWEIGHT_INIT" ]; then
-  # perform the bulkier parts of the login and initialization.
+  # perform the bulkier parts of the initialization process.
 
-  if [ ! -z "$SHELL_DEBUG" ]; then echo heavyweight login 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.
-  alias regenerated &>/dev/null  # see if a crucial alias exists.
+  type CORE_ALIASES_LOADED &>/dev/null
   if [ $? -ne 0 ]; then
     if [ ! -z "$SHELL_DEBUG" ]; then
-      echo the aliases were missing, now they are added...
+      echo "the aliases were missing, now they are being added..."
     fi
-    source "$FEISTY_MEOW_GENERATED/fmc_core_and_custom_aliases.sh"
+    source "$FEISTY_MEOW_LOADING_DOCK/fmc_core_and_custom_aliases.sh"
   fi
 
-  # 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
-  fi
+## disabled since we don't think is needed any more, and it's just an
+## attack surface if the other users on the host are not trusted.
+#  # 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
+#  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
 
-  if [ ! -z "$SHELL_DEBUG" ]; then echo heavyweight login ends....; fi
+  if [ ! -z "$SHELL_DEBUG" ]; then echo "heavyweight init is done."; fi
+fi
+
+if [ -z "$ERROR_OCCURRED" ]; then
+  # set a sentinel variable to say we loaded the feisty meow environment.
+  export FEISTY_MEOW_SCRIPTS_LOADED=true
 fi