projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
trying again; was only getting the link for feisty meow code.
[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 d6aed1e00ee7d10de54efbdbae35b345b413f0f2..a75c5f57a199c5ebc692f94ad01a3d7426797311 100644
(file)
--- a/
scripts/core/launch_feisty_meow.sh
+++ b/
scripts/core/launch_feisty_meow.sh
@@
-10,10
+10,13
@@
##############
##############
-export SHELL_DEBUG=true
+
#
export SHELL_DEBUG=true
# this variable causes the scripts that listen to it to print more information
# when they run.
# 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
##############
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'
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
##############
fi
##############
@@
-41,12
+45,14
@@
if [ -z "$FEISTY_MEOW_GENERATED" ]; then
# Set up the temporary directory.
source $FEISTY_MEOW_SCRIPTS/core/create_tempdir.sh
# 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
##############
##############
@@
-71,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.
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 regenerate
d
&>/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...
if [ $? -ne 0 ]; then
if [ ! -z "$SHELL_DEBUG" ]; then
echo the aliases were missing, now they are added...
@@
-93,3
+99,8
@@
if [ -z "$LIGHTWEIGHT_INIT" ]; then
if [ ! -z "$SHELL_DEBUG" ]; then echo heavyweight login ends....; fi
fi
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
+