making this be quieter.

[feisty_meow.git] / scripts / core / launch_feisty_meow.sh

diff --git a/scripts/core/launch_feisty_meow.sh b/scripts/core/launch_feisty_meow.sh
index 26b6151104bf8fa6673a62ffe9712e8e8aee07df..e0184f5d8250a8c6a57d54079f83102656e3e616 100644 (file)
--- a/scripts/core/launch_feisty_meow.sh
+++ b/scripts/core/launch_feisty_meow.sh
@@ -41,13 +41,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 +73,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...