fixed complaint during recustomize when nothing exists in custom yet.

[feisty_meow.git] / scripts / core / variables.sh

diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh
index 3f2368e6a2d4e8e0616a82ee0dc2c2277bd40e6a..ad39a8f92b1fd3deb74bd565a6ccd21c966906f1 100644 (file)
--- a/scripts/core/variables.sh
+++ b/scripts/core/variables.sh
@@ -7,6 +7,31 @@
 #   environment.
 # Author: Chris Koeritz
 
+##############
+
+#hmmm: moved from functions.sh; does that hose everything up?
+
+  # defines a variable within the feisty meow environment and remembers that
+  # this is a new or modified definition.  if the feisty meow codebase is
+  # unloaded, then so are all the variables that were defined.
+  # this function always exports the variables it defines.
+  function define_yeti_variable()
+  {
+# if variable exists already, save old value for restore,
+# otherwise save null value for restore,
+# have to handle unsetting if there was no prior value of one
+# we newly defined.
+# add variable name to a list of feisty defined variables.
+
+#hmmm: first implem just sets it up and exports the variable.
+#  i.e., this method always exports.
+export "${@}" 
+
+
+return 0
+  }
+
+
 ##############
 
 # this section should always run or bash will reset them on us.
@@ -69,14 +94,29 @@ if [ -z "$NECHUNG" ]; then
       define_yeti_variable FEISTY_MEOW_SCRIPTS="$FEISTY_MEOW_SCRIPTS"
     fi
   fi
-  
+
+  # set up the top-level for all build creations and logs and such.
+  if [ -z "$GENERATED_DIR" ]; then
+    define_yeti_variable GENERATED_DIR="$TMP/generated-feisty_meow"
+  fi
+  if [ ! -d "$GENERATED_DIR" ]; then
+    mkdir -p "$GENERATED_DIR"
+  fi
+  # set up our effluent outsourcing valves.
+  if [ -z "$TEMPORARIES_DIR" ]; then
+    define_yeti_variable TEMPORARIES_DIR="$GENERATED_DIR/temporaries"
+  fi
+  if [ ! -d "$TEMPORARIES_DIR" ]; then
+    mkdir -p "$TEMPORARIES_DIR"
+  fi
+
   # similarly, make sure we have someplace to look for our generated files, if
   # we were not handed a value.
-  if [ -z "$FEISTY_MEOW_GENERATED" ]; then
+  if [ -z "$FEISTY_MEOW_LOADING_DOCK" ]; 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.
-    define_yeti_variable FEISTY_MEOW_GENERATED=$HOME/.zz_auto_gen
+    define_yeti_variable FEISTY_MEOW_LOADING_DOCK=$HOME/.zz_feisty_loading
   fi
   
   ##############
@@ -156,9 +196,8 @@ if [ -z "$NECHUNG" ]; then
     fi
     # now augment the environment if we found our build variables.
     if [ $found_build_vars == 1 ]; then
-      # the binary directory contains handy programs we use a lot.  we set
-      # up the path to it here based on the operating system.
-      define_yeti_variable BINDIR=$FEISTY_MEOW_DIR/production/binaries
+      # the binary directory contains our collection of handy programs.
+      define_yeti_variable BINDIR=$TARGETS_DIR
       # add binaries created within build to the path.
       define_yeti_variable PATH="$(dos_to_unix_path $BINDIR):$PATH"
       # Shared libraries are located via this variable.
@@ -183,7 +222,7 @@ if [ -z "$NECHUNG" ]; then
   
   # add to the PATH variables used for locating applications.  this step is taken after any
   # potential overrides from the user.
-  define_yeti_variable PATH="$(dos_to_unix_path $FEISTY_MEOW_GENERATED):$PATH:$(find /usr/local/games -maxdepth 1 -type d -exec echo -n {}: ';' 2>/dev/null)/sbin"
+  define_yeti_variable PATH="$(dos_to_unix_path $FEISTY_MEOW_LOADING_DOCK):$PATH:$(find /usr/local/games -maxdepth 1 -type d -exec echo -n {}: ';' 2>/dev/null)/sbin"
   
   ##############
 
@@ -202,7 +241,7 @@ fi
 # override individual variables and definitions.  we also don't guard this
 # to avoid running it again, because we don't know what mix of functions and
 # aliases they want to define in there.
-for i in $FEISTY_MEOW_GENERATED/custom/*.sh; do
+for i in $FEISTY_MEOW_LOADING_DOCK/custom/*.sh; do
   if [ ! -f "$i" ]; then
     # skip it if it's not real.
     continue;