X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Flaunch_feisty_meow.sh;h=a75c5f57a199c5ebc692f94ad01a3d7426797311;hb=5749150c8446a9e65a7c20558a758a2add5e8839;hp=26b6151104bf8fa6673a62ffe9712e8e8aee07df;hpb=6f6cc76fec8dbdeeebff1b877304de4655475586;p=feisty_meow.git

diff --git a/scripts/core/launch_feisty_meow.sh b/scripts/core/launch_feisty_meow.sh
index 26b61511..a75c5f57 100644
--- a/scripts/core/launch_feisty_meow.sh
+++ b/scripts/core/launch_feisty_meow.sh
@@ -14,6 +14,9 @@
   # this variable causes the scripts that listen to it to print more information
   # when they run.
 
+export ERROR_OCCURRED=
+  # no error to start with.
+
 ##############
 
 if [ -z "$FEISTY_MEOW_GENERATED" ]; then
@@ -30,6 +33,7 @@ if [ -z "$FEISTY_MEOW_GENERATED" ]; then
     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'
+    ERROR_OCCURRED=true
   fi
 
   ##############
@@ -41,13 +45,25 @@ if [ -z "$FEISTY_MEOW_GENERATED" ]; then
   # 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
 
+##############
+  
+# 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.
@@ -61,7 +77,7 @@ if [ -z "$LIGHTWEIGHT_INIT" ]; then
   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 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...
@@ -83,3 +99,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
+