X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Fvariables.sh;h=e3dcb0f0af6ccc8ff1a22005bd7a4591236f2153;hb=df2fd38ab5e5d97c24b22f24acef7d0b031d9739;hp=07e03ee65d0d8d6314fa42e1cdd81faf01206b0c;hpb=32d7caf45d886d0d24e69eea00511c7815ac15d0;p=feisty_meow.git

diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh
index 07e03ee6..e3dcb0f0 100644
--- a/scripts/core/variables.sh
+++ b/scripts/core/variables.sh
@@ -41,21 +41,21 @@ fi
 # configuration examples, javascript code, and other stuff.
 export SCRIPT_SYSTEM=feisty_meow
 
-#if [ -z "$YETI_DIR" ]; then export YETI_DIR="$HOME/$SCRIPT_SYSTEM"; fi
-#if [ -z "$YETI_SCRIPTS" ]; then export YETI_SCRIPTS="$YETI_DIR/scripts"; fi
-#if [ -z "$SHELLDIR" ]; then export SHELLDIR="$YETI_SCRIPTS"; fi
+#if [ -z "$FEISTY_MEOW_DIR" ]; then export FEISTY_MEOW_DIR="$HOME/$SCRIPT_SYSTEM"; fi
+#if [ -z "$FEISTY_MEOW_SCRIPTS" ]; then export FEISTY_MEOW_SCRIPTS="$FEISTY_MEOW_DIR/scripts"; fi
+#if [ -z "$FEISTY_MEOW_SCRIPTS" ]; then export FEISTY_MEOW_SCRIPTS="$FEISTY_MEOW_SCRIPTS"; fi
 
 # include helpful functions.
-source "$YETI_SCRIPTS/core/functions.sh"
+source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"
 
 # LIBDIR is an older variable that points at the root of the yeti code.
-export LIBDIR=$YETI_DIR
+export LIBDIR=$FEISTY_MEOW_DIR
 
-if [ -z "$GENERADIR" ]; then
+if [ -z "$FEISTY_MEOW_GENERATED" ]; then
   # The generated scripts directory is where automatically generated files live.
   # It is separate from the main body of the shell scripts in order to keep things from
   # exploding.
-  export GENERADIR=$HOME/.zz_auto_gen
+  export FEISTY_MEOW_GENERATED=$HOME/.zz_auto_gen
 fi
 
 ##############################################################################
@@ -63,8 +63,10 @@ fi
 ##############################################################################
 
 # pull in the custom overrides for feisty_meow scripts.
-for i in $YETI_SCRIPTS/custom/*.sh; do
-  echo "Sourcing custom file: $i"
+for i in $FEISTY_MEOW_SCRIPTS/custom/*.sh; do
+  if [ ! -z "$SHELL_DEBUG" ]; then
+    echo "loading customization: $(basename $(dirname $i))/$(basename $i)"
+  fi
   source $i
 done
 
@@ -79,16 +81,16 @@ export PERLLIB
 if [ "$OS" != "Windows_NT" ]; then
   PERLLIB+="/usr/lib/perl5"
 else
-#echo "the scripts dir is $YETI_SCRIPTS"
-  YETI_SCRIPTS="$(echo $YETI_SCRIPTS | sed -e 's/\\/\//g')"
-  SHELLDIR="$YETI_SCRIPTS"
-#echo "the scripts dir is now $SHELLDIR"
+#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 system's so we can handle file bytes exactly.
 fi
 
 #make this automatic!
-PERLLIB+=":$YETI_SCRIPTS/core:$YETI_SCRIPTS/text:$YETI_SCRIPTS/files:$YETI_SCRIPTS/archival"
+PERLLIB+=":$FEISTY_MEOW_SCRIPTS/core:$FEISTY_MEOW_SCRIPTS/text:$FEISTY_MEOW_SCRIPTS/files:$FEISTY_MEOW_SCRIPTS/archival"
 
 # set this so nechung can find its data.
 export NECHUNG=$LIBDIR/database/fortunes.dat
@@ -111,31 +113,31 @@ if [ -z "$SVN_EDITOR" ]; then
 fi
 
 # include variables needed for compiling hoople and using its scripts.
-if [ -z "$REPOSITORY_DIR" ]; then
+if [ -z "$FEISTY_MEOW_DIR" ]; then
   if [ -d "$HOME/feisty_meow" ]; then
-    export REPOSITORY_DIR="$HOME/feisty_meow"
+    export FEISTY_MEOW_DIR="$HOME/feisty_meow"
   fi
 fi
 
 # initialize the build variables, if possible.
 found_build_vars=0
-if [ ! -z "$REPOSITORY_DIR" ]; then
+if [ ! -z "$FEISTY_MEOW_DIR" ]; then
   # first guess at using the old school bin directory.
-  bv="$REPOSITORY_DIR/bin/build_variables.sh"
+  bv="$FEISTY_MEOW_DIR/bin/build_variables.sh"
   if [ -f "$bv" ]; then
     # the old bin directory is present, so let's use its build vars.
     source "$bv" "$bv"
     found_build_vars=1
   else
     # try again with the new school location for the file.
-    bv="$REPOSITORY_DIR/scripts/generator/build_variables.sh"
+    bv="$FEISTY_MEOW_DIR/scripts/generator/build_variables.sh"
     if [ -f "$bv" ]; then
       # yep, that one looks good, so pull in the build defs.
       source "$bv" "$bv"
       found_build_vars=1
     else
       # try once more with new school and assume we're deep.
-      bv="$REPOSITORY_DIR/../../scripts/generator/build_variables.sh"
+      bv="$FEISTY_MEOW_DIR/../../scripts/generator/build_variables.sh"
       if [ -f "$bv" ]; then
         # sweet, there is something there.
         source "$bv" "$bv"
@@ -154,7 +156,7 @@ if [ $found_build_vars == 1 ]; then
   # the binaries, but now we don't ship them with yeti any more as pre-built items.  this reduces
   # the size of the code package a lot and shortens up our possible exposure to compromised
   # binaries.  people can bootstrap up their own set from hoople now instead.
-  export BINDIR=$REPOSITORY_DIR/production/binaries
+  export BINDIR=$FEISTY_MEOW_DIR/production/binaries
 
   # add binaries created within build to the path.
   export PATH="$(dos_to_msys_path $BUILD_TOP/build/bin):$PATH"
@@ -164,7 +166,7 @@ if [ $found_build_vars == 1 ]; then
 fi
 
 # Set the path for locating applications.
-export PATH="$(dos_to_msys_path $BINDIR):$(dos_to_msys_path $GENERADIR):$PATH:/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/lib:/usr/games:/usr/bin:."
+export PATH="$(dos_to_msys_path $BINDIR):$(dos_to_msys_path $FEISTY_MEOW_GENERATED):$PATH:/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/lib:/usr/games:/usr/bin:."
 
 if [ ! -z "$SHELL_DEBUG" ]; then echo variables initialization ends....; fi