X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Flaunch_feisty_meow.sh;h=fa9d34e822ee954350bd9c6c98fffdf227c0bb68;hb=0bcf01016848c74240ebeee81f73607598c2a9ea;hp=7c31837561e318990efd92011db280ff239e69cb;hpb=cb1380834ef1db724f4e71ce80aabee0f23e9043;p=feisty_meow.git

diff --git a/scripts/core/launch_feisty_meow.sh b/scripts/core/launch_feisty_meow.sh
index 7c318375..fa9d34e8 100644
--- a/scripts/core/launch_feisty_meow.sh
+++ b/scripts/core/launch_feisty_meow.sh
@@ -10,53 +10,70 @@
 
 ##############
 
-export SHELL_DEBUG=true
+#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.
+
 ##############
 
-# 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"
-if [ ! -z "$WINDIR" -o ! -z "$windir" ]; then
-  # assume they are using windoze.
-  export FEISTY_MEOW_GENERATED="$TMP/zz_auto_gen"
-fi
+if [ -z "$FEISTY_MEOW_GENERATED" ]; then
+  # FEISTY_MEOW_GENERATED 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"
+#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
+    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
 
-# make sure our main variables are established.
-GENERATED_FEISTY_MEOW_VARIABLES="$FEISTY_MEOW_GENERATED/feisty_meow_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
+  ##############
 
-# pull in our variable set.
-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
 
 ##############
 
-# Set up all of the environment's system variables.  This is the first step
-# in the majestic plan we have for this shell's initialization.
+# 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 and spaces for history.
+HISTCONTROL=ignoredups:ignorespace
+# append to the history file.
+shopt -s histappend
+# automatically update window size if needed.
+shopt -s checkwinsize
 
 ##############
 
@@ -65,17 +82,13 @@ if [ -z "$LIGHTWEIGHT_INIT" ]; then
 
   if [ ! -z "$SHELL_DEBUG" ]; then echo heavyweight login begins...; fi
 
-#FEISTY_MEOW_GENERATED=$(echo $FEISTY_MEOW_GENERATED | sed -e 's/\\/\//g')
-#FEISTY_MEOW_SCRIPTS="$(echo $FEISTY_MEOW_SCRIPTS | sed -e 's/\\/\//g')"
-#FEISTY_MEOW_SCRIPTS="$FEISTY_MEOW_SCRIPTS"
-
   # 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.
+  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/aliases.sh
+    source "$FEISTY_MEOW_GENERATED/fmc_core_and_custom_aliases.sh"
   fi
 
   # allow connections to our x server from the local host.
@@ -92,3 +105,8 @@ if [ -z "$LIGHTWEIGHT_INIT" ]; then
   if [ ! -z "$SHELL_DEBUG" ]; then echo heavyweight login ends....; 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
+