projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
new report, actually worse than after left office...
[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 5cefe78595d545df572902973749d636445cd00d..fec110793daf8d4ff2b679219129561402658dac 100644
(file)
--- a/
scripts/core/launch_feisty_meow.sh
+++ b/
scripts/core/launch_feisty_meow.sh
@@
-22,19
+22,19
@@
export ERROR_OCCURRED=
# there have been no errors to start with, at least. we will set this
# to non-empty if something bad happens.
# there have been no errors to start with, at least. we will set this
# to non-empty if something bad happens.
-if [ -z "$FEISTY_MEOW_
GENERATED
" ]; then
- # FEISTY_MEOW_
GENERATED
is where the generated files are located.
+if [ -z "$FEISTY_MEOW_
LOADING_DOCK
" ]; then
+ # FEISTY_MEOW_
LOADING_DOCK
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.
# 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
"
+ export FEISTY_MEOW_
LOADING_DOCK="$HOME/.zz_feisty_loading
"
#hmmm: the above is kind of a constant. that's not so great.
# make sure our main variables are established.
#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
+
FEISTY_MEOW_VARIABLES_LOADING_FILE="$FEISTY_MEOW_LOADING_DOCK
/fmc_variables.sh"
+ if [ ! -f "$
FEISTY_MEOW_VARIABLES_LOADING_FILE
" ]; then
echo -e '\n\n'
echo "Feisty meow scripts need initialization via the bootstrap process, e.g.:"
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 " bash $HOME/feisty_meow/scripts/core/
reconfigure_feisty_meow
.sh"
echo -e '\n\n'
ERROR_OCCURRED=true
fi
echo -e '\n\n'
ERROR_OCCURRED=true
fi
@@
-43,7
+43,7
@@
if [ -z "$FEISTY_MEOW_GENERATED" ]; then
# pull in our generated variables that are the minimal set we need to find
# the rest of our resources.
# pull in our generated variables that are the minimal set we need to find
# the rest of our resources.
- source "$
GENERATED_FEISTY_MEOW_VARIABLES
"
+ source "$
FEISTY_MEOW_VARIABLES_LOADING_FILE
"
# 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
@@
-90,7
+90,7
@@
if [ -z "$LIGHTWEIGHT_INIT" ]; then
if [ ! -z "$SHELL_DEBUG" ]; then
echo "the aliases were missing, now they are being added..."
fi
if [ ! -z "$SHELL_DEBUG" ]; then
echo "the aliases were missing, now they are being added..."
fi
- source "$FEISTY_MEOW_
GENERATED
/fmc_core_and_custom_aliases.sh"
+ source "$FEISTY_MEOW_
LOADING_DOCK
/fmc_core_and_custom_aliases.sh"
fi
# allow connections to our x server from the local host.
fi
# allow connections to our x server from the local host.