oops, wrong side of if.

[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 581b950eebb026a6208f96f99656ba419a592f45..03db5cb8f4d831f95957f99257654c2ead48f485 100644 (file)
--- a/scripts/core/launch_feisty_meow.sh
+++ b/scripts/core/launch_feisty_meow.sh
@@ -10,54 +10,49 @@
 
 ##############
 
-#export SHELL_DEBUG=true
+export SHELL_DEBUG=true
   # this variable causes the scripts that listen to it to print more information
   # when they run.
 
 ##############
 
-# FEISTY_MEOW_GENERATED is where the generated files yeti uses are located.
-# 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
+if [ -z "$FEISTY_MEOW_GENERATED" ]; then
+  # FEISTY_MEOW_GENERATED is where the generated files yeti uses are located.
+  # 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"
+#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
+    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'
+  fi
 
-# make sure our main variables are established.
-GENERATED_FEISTY_MEOW_VARIABLES="$FEISTY_MEOW_GENERATED/feisty_meow_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.:"
-  echo "  bash $HOME/feisty_meow/scripts/core/bootstrap_shells.sh"
-  echo -e '\n\n'
-fi
+  ##############
 
-# pull in our variable set.
-source "$GENERATED_FEISTY_MEOW_VARIABLES"
+  # 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 the temporary directory.
+  source $FEISTY_MEOW_SCRIPTS/core/create_tempdir.sh
 
-# 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.
-source $FEISTY_MEOW_SCRIPTS/core/variables.sh
+  ##############
 
-# Set up the temporary directory...
-source $FEISTY_MEOW_SCRIPTS/core/create_tempdir.sh
+  # load the larger body of standard feisty meow variables into the environment.
+  source $FEISTY_MEOW_SCRIPTS/core/variables.sh
 
-##############
-
-# check if this is dos/windows.
-if [ "$OS" == "Windows_NT" ]; then
-  if [ -z "$HOME" ]; then
-    # set a default that might not be appropriate for everyone, but should
-    # still work.
-    export HOME=/c/home
-  fi
-  if [ ! -d "$HOME" ]; then mkdir $HOME; fi
 fi
 
+# check hash table before searching path.
+shopt -s checkhash
+# don't check path for sourced files.
+shopt -u sourcepath
+
 ##############
 
 if [ -z "$LIGHTWEIGHT_INIT" ]; then
@@ -65,17 +60,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/core_and_custom_aliases.sh"
+    source "$FEISTY_MEOW_GENERATED/fmc_core_and_custom_aliases.sh"
   fi
 
   # allow connections to our x server from the local host.