X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Flaunch_feisty_meow.sh;h=3d72ac071963ea8f4b3ca45da073deadfa8c731f;hb=8cae6bcb0a4c8962c18d50f7323558dddf299b2f;hp=ad9a12c019bca3c8c9c86e23758cf7ea06062d11;hpb=c6b1ddda98d13e1202ab0b71876693848bc28a27;p=feisty_meow.git

diff --git a/scripts/core/launch_feisty_meow.sh b/scripts/core/launch_feisty_meow.sh
index ad9a12c0..3d72ac07 100644
--- a/scripts/core/launch_feisty_meow.sh
+++ b/scripts/core/launch_feisty_meow.sh
@@ -10,72 +10,93 @@
 
 ##############
 
+# 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.
 
 ##############
 
-# FEISTY_MEOW_GENERATED is where the generated files yeti uses 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"
-
-# make sure our main variables are established.
-GENERATED_FEISTY_MEOW_VARIABLES="$FEISTY_MEOW_GENERATED/fmc_variables.sh"
-if [ ! -f "$GENERATED_FEISTY_MEOW_VARIABLES" ]; 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 -e '\n\n'
-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.
+
+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_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_LOADING_DOCK/fmc_variables.sh"
+  if [ ! -f "$GENERATED_FEISTY_MEOW_VARIABLES" ]; then
+    echo -e '\n\n'
+    echo "Feisty meow scripts need initialization via the bootstrap process, e.g.:"
+    echo "  bash $HOME/feisty_meow/scripts/core/bootstrap_shells.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"
+  # pull in our generated variables that are the minimal set we need to find
+  # the rest of our resources.
+  source "$GENERATED_FEISTY_MEOW_VARIABLES"
+
+  # Set up the temporary directory.
+  source $FEISTY_MEOW_SCRIPTS/core/create_tempdir.sh
+
+fi
 
 ##############
 
-# load all the standard feisty meow variables into the environment.
+# 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
 
-# Set up the temporary directory.
-source $FEISTY_MEOW_SCRIPTS/core/create_tempdir.sh
-
 ##############
-
-# check if this is dos/windows.
-if [ "$OS" == "Windows_NT" ]; then
-  if [ -z "$HOME" ]; then
-    # set a default that might not be appropriate for everyone, but should
-    # still work.
-    export HOME=c:/home
-  fi
-  if [ ! -d "$HOME" ]; then mkdir $HOME; fi
-fi
+  
+# 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...).
+source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"
+  
+##############
+  
+# check hash table before searching path.
+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
 
 ##############
 
 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.
-  if [ $? -ne 0 ]; then
+  if [ -z "$CORE_ALIASES_LOADED" ]; 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
+      if [ ! -z "$SHELL_DEBUG" ]; then echo "Enabling localhost X connections..."; fi
       xhost + localhost >/dev/null 2>&1
     fi
   fi
@@ -83,6 +104,11 @@ if [ -z "$LIGHTWEIGHT_INIT" ]; then
   # 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