taking out /etc/alternatives

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

diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh
index 8c50f202781185419176ffbb8fdb9316229f344e..f8004df59feb1d0e83d93530616dfdf76fcc3b7e 100644 (file)
--- a/scripts/core/variables.sh
+++ b/scripts/core/variables.sh
@@ -88,20 +88,40 @@ if [ -z "$NECHUNG" ]; then
   # set the main root directory variable for the feisty meow codebase.
   # this is only used for extreme failure modes, when the values were not
   # pulled in from our auto-generated config.
-  if [ -z "$FEISTY_MEOW_DIR" ]; then
+  if [ -z "$FEISTY_MEOW_APEX" ]; then
     if [ -d "$HOME/feisty_meow" ]; then
-      define_yeti_variable FEISTY_MEOW_DIR="$HOME/feisty_meow"
+      define_yeti_variable FEISTY_MEOW_APEX="$HOME/feisty_meow"
       define_yeti_variable FEISTY_MEOW_SCRIPTS="$FEISTY_MEOW_SCRIPTS"
     fi
   fi
-  
+
+  # main declaration of the transients area.
+  if [ -z "$TMP" ]; then
+    define_yeti_variable TMP=$HOME/.tmp
+  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
   
   ##############
@@ -132,6 +152,7 @@ if [ -z "$NECHUNG" ]; then
   # variables for perl.
   
   define_yeti_variable PERLLIB+="/usr/lib/perl5"
+  define_yeti_variable PERL5LIB+="/usr/lib/perl5"
   if [ "$OS" == "Windows_NT" ]; then
     define_yeti_variable PERLIO=:perlio
       # choose perl's IO over the ms-windows version so we can handle file
@@ -146,6 +167,7 @@ if [ -z "$NECHUNG" ]; then
       ls $i/*.pl &>/dev/null
       if [ $? -eq 0 ]; then
         PERLLIB+=":$(dos_to_unix_path $i)"
+        PERL5LIB+=":$(dos_to_unix_path $i)"
       fi
     fi
   done
@@ -154,7 +176,7 @@ if [ -z "$NECHUNG" ]; then
   ##############
   
   # set this so nechung can find its data.
-  define_yeti_variable NECHUNG=$FEISTY_MEOW_DIR/infobase/fortunes.dat
+  define_yeti_variable NECHUNG=$FEISTY_MEOW_APEX/infobase/fortunes.dat
   
   # ensure we use the right kind of secure shell.
 #  define_yeti_variable CVS_RSH=$FEISTY_MEOW_SCRIPTS/security/ssh.sh
@@ -171,7 +193,7 @@ if [ -z "$NECHUNG" ]; then
   {
     found_build_vars=0
     # we need to know the feisty meow directory, or we bail.
-    if [ -z "$FEISTY_MEOW_DIR" ]; then return; fi
+    if [ -z "$FEISTY_MEOW_APEX" ]; then return; fi
     # pick from our expected generator folder, but make sure it's there...
     buildvars="$FEISTY_MEOW_SCRIPTS/generator/build_variables.sh"
     if [ -f "$buildvars" ]; then
@@ -181,9 +203,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.
@@ -208,7 +229,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"
   
   ##############
 
@@ -227,7 +248,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;