From: Chris Koeritz <fred@gruntose.com>
Date: Thu, 23 Feb 2012 16:47:25 +0000 (-0500)
Subject: fixed a couple more things that needed to be set again.
X-Git-Tag: 2.140.90~1563
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=1ceb09a8d17617d7d33b882a97a0456e5fe1033d;p=feisty_meow.git

fixed a couple more things that needed to be set again.
---

diff --git a/scripts/core/launch_feisty_meow.sh b/scripts/core/launch_feisty_meow.sh
index d6aed1e0..e3f7d2ea 100644
--- a/scripts/core/launch_feisty_meow.sh
+++ b/scripts/core/launch_feisty_meow.sh
@@ -41,12 +41,14 @@ 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
 
 ##############
   
diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh
index 67144bba..34198620 100644
--- a/scripts/core/variables.sh
+++ b/scripts/core/variables.sh
@@ -200,12 +200,5 @@ if [ -z "$NECHUNG" ]; then
   
   if [ ! -z "$SHELL_DEBUG" ]; then echo variables initialization ends....; fi
 
-else
-  # we are seeing this lot again, we believe, so make things easier for the
-  # rest of initialization.
-  export LIGHTWEIGHT_INIT=true
-  if [ ! -z "$SHELL_DEBUG" ]; then
- echo skipped var init and put in lightweight mode due to belief in previous existence.; 
-fi
 fi