updated and cleaned...

[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 7c31837561e318990efd92011db280ff239e69cb..9b1a4e5b34613ba4bdca8e90f895a44b63c80504 100644 (file)
--- a/scripts/core/launch_feisty_meow.sh
+++ b/scripts/core/launch_feisty_meow.sh
@@ -10,7 +10,7 @@
 
 ##############
 
-export SHELL_DEBUG=true
+#export SHELL_DEBUG=true
   # this variable causes the scripts that listen to it to print more information
   # when they run.
 
@@ -20,13 +20,9 @@ export SHELL_DEBUG=true
 # 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"
-if [ ! -z "$WINDIR" -o ! -z "$windir" ]; then
-  # assume they are using windoze.
-  export FEISTY_MEOW_GENERATED="$TMP/zz_auto_gen"
-fi
 
 # make sure our main variables are established.
-GENERATED_FEISTY_MEOW_VARIABLES="$FEISTY_MEOW_GENERATED/feisty_meow_variables.sh"
+GENERATED_FEISTY_MEOW_VARIABLES="$FEISTY_MEOW_GENERATED/fmc_variables.sh"
 if [ ! -f "$GENERATED_FEISTY_MEOW_VARIABLES" ]; then
   echo -e '\n\n'
   echo "The yeti scripts need to be initialized via the bootstrap process, e.g.:"
@@ -34,16 +30,18 @@ if [ ! -f "$GENERATED_FEISTY_MEOW_VARIABLES" ]; then
   echo -e '\n\n'
 fi
 
-# pull in our variable set.
+##############
+
+# pull in our generated variables that are the minimal set we need to find
+# the rest of our resources.
 source "$GENERATED_FEISTY_MEOW_VARIABLES"
 
 ##############
 
-# Set up all of the environment's system variables.  This is the first step
-# in the majestic plan we have for this shell's initialization.
+# load all the standard feisty meow variables into the environment.
 source $FEISTY_MEOW_SCRIPTS/core/variables.sh
 
-# Set up the temporary directory...
+# Set up the temporary directory.
 source $FEISTY_MEOW_SCRIPTS/core/create_tempdir.sh
 
 ##############
@@ -65,17 +63,13 @@ if [ -z "$LIGHTWEIGHT_INIT" ]; then
 
   if [ ! -z "$SHELL_DEBUG" ]; then echo heavyweight login begins...; fi
 
-#FEISTY_MEOW_GENERATED=$(echo $FEISTY_MEOW_GENERATED | sed -e 's/\\/\//g')
-#FEISTY_MEOW_SCRIPTS="$(echo $FEISTY_MEOW_SCRIPTS | sed -e 's/\\/\//g')"
-#FEISTY_MEOW_SCRIPTS="$FEISTY_MEOW_SCRIPTS"
-
   # 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.
   if [ $? -ne 0 ]; then
     if [ ! -z "$SHELL_DEBUG" ]; then
       echo the aliases were missing, now they are added...
     fi
-    source $FEISTY_MEOW_GENERATED/aliases.sh
+    source "$FEISTY_MEOW_GENERATED/fmc_core_and_custom_aliases.sh"
   fi
 
   # allow connections to our x server from the local host.