From: Chris Koeritz <fred@gruntose.com>
Date: Wed, 22 Feb 2012 15:17:49 +0000 (-0500)
Subject: fixed an oops where we had been expecting bash to convey our functions
X-Git-Tag: 2.140.90~1568
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=d3a4525a35121353724f66f57fac2e8b5b0dfca4;p=feisty_meow.git

fixed an oops where we had been expecting bash to convey our functions
to subshells, which it just will not do.
---

diff --git a/scripts/core/launch_feisty_meow.sh b/scripts/core/launch_feisty_meow.sh
index 03db5cb8..d6aed1e0 100644
--- a/scripts/core/launch_feisty_meow.sh
+++ b/scripts/core/launch_feisty_meow.sh
@@ -48,6 +48,16 @@ if [ -z "$FEISTY_MEOW_GENERATED" ]; then
 
 fi
 
+##############
+  
+# include helpful functions.  we do this every time rather than making it part
+# of variable initialization, because functions cannot be exported to
+# sub-shells in bash (much like aliases cannot, to our infinite chagrin after
+# having migrated from korn shell...).
+source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"
+  
+##############
+  
 # check hash table before searching path.
 shopt -s checkhash
 # don't check path for sourced files.
diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh
index 5586ea16..1f37bb82 100644
--- a/scripts/core/variables.sh
+++ b/scripts/core/variables.sh
@@ -61,11 +61,6 @@ if [ -z "$NECHUNG" ]; then
   
   ##############
   
-  # include helpful functions.
-  source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"
-  
-  ##############
-  
   # user variables, sort of...  if they haven't given themselves a name yet,
   # then we will make one up for them.