X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Flaunch_feisty_meow.sh;h=1db167831f4d07fa61359c06f82ae35e3d386689;hb=7160a9d8b361d96926f008bf958ce94a30c6eb09;hp=03db5cb8f4d831f95957f99257654c2ead48f485;hpb=f7761f64aefda43f4afec408f1cfe20afc063bc8;p=feisty_meow.git diff --git a/scripts/core/launch_feisty_meow.sh b/scripts/core/launch_feisty_meow.sh index 03db5cb8..1db16783 100644 --- 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...