using the variables script in our bootstrap, since otherwise PERLLIB isn't set yet.

diff --git a/scripts/core/bootstrap_shells.sh b/scripts/core/bootstrap_shells.sh
index 5c9b4941893663110ff09a56417bfe24187931ff..6f052e72a952738833feef7661fd3474480c0bcc 100644 (file)
--- a/scripts/core/bootstrap_shells.sh
+++ b/scripts/core/bootstrap_shells.sh
@@ -37,6 +37,9 @@ for i in FEISTY_MEOW_DIR FEISTY_MEOW_SCRIPTS FEISTY_MEOW_GENERATED; do
   echo "export $i=${!i}" >>"$GENERATED_FEISTY_MEOW_VARIABLES"
 done
 
+# load our variables so we get a useful PERLLIB variable.
+source "$FEISTY_MEOW_SCRIPTS/core/variables.sh"
+
 # create our common aliases.
 perl "$FEISTY_MEOW_SCRIPTS/core/generate_aliases.pl"
 

diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh
index d3d12f2a4a6c711bb95df0cf49ff16f084f72d06..85fc0bbc4e6eb37d0d34c8e3ec9834933757aa3f 100644 (file)
--- a/scripts/core/variables.sh
+++ b/scripts/core/variables.sh
@@ -107,12 +107,6 @@ export PERLLIB
 if [ "$OS" != "Windows_NT" ]; then
   PERLLIB+="/usr/lib/perl5"
 else
-
-#echo "the scripts dir is $FEISTY_MEOW_SCRIPTS"
-#  FEISTY_MEOW_SCRIPTS="$(echo $FEISTY_MEOW_SCRIPTS | sed -e 's/\\/\//g')"
-#  FEISTY_MEOW_SCRIPTS="$FEISTY_MEOW_SCRIPTS"
-#echo "the scripts dir is now $FEISTY_MEOW_SCRIPTS"
-
   export PERLIO=:perlio
     # choose perl's IO over the ms-windows version so we can handle file
     # bytes properly.