stopped using a mount, which is on an insecure device.

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

diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh
index ad39a8f92b1fd3deb74bd565a6ccd21c966906f1..b71defbeb00b653c311fce599df6b32ecda2711e 100644 (file)
--- a/scripts/core/variables.sh
+++ b/scripts/core/variables.sh
@@ -79,6 +79,11 @@ if [ -z "$NECHUNG" ]; then
     # IS_MSYS will be non-empty if this is the msys toolset.  otherwise
     # we assume that it's cygwin.
     IS_MSYS=$(uname | grep -i ming)
+
+    # if not MSYS, then we'll assume cygwin and set the cygwin root var.
+    if [ -z "$IS_MSYS" ]; then
+      define_yeti_variable CYGROOT=$(cygpath -w -m /)
+    fi
   fi
 
   ##############
@@ -88,13 +93,18 @@ 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"
@@ -147,6 +157,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
@@ -161,6 +172,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
@@ -169,7 +181,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
@@ -186,7 +198,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
@@ -197,11 +209,11 @@ if [ -z "$NECHUNG" ]; then
     # now augment the environment if we found our build variables.
     if [ $found_build_vars == 1 ]; then
       # the binary directory contains our collection of handy programs.
-      define_yeti_variable BINDIR=$TARGETS_DIR
+      define_yeti_variable FEISTY_MEOW_BINARIES=$TARGETS_DIR
       # add binaries created within build to the path.
-      define_yeti_variable PATH="$(dos_to_unix_path $BINDIR):$PATH"
+      define_yeti_variable PATH="$(dos_to_unix_path $FEISTY_MEOW_BINARIES):$PATH"
       # Shared libraries are located via this variable.
-      define_yeti_variable LD_LIBRARY_PATH="$(dos_to_unix_path $LD_LIBRARY_PATH):$(dos_to_unix_path $BINDIR)"
+      define_yeti_variable LD_LIBRARY_PATH="$(dos_to_unix_path $LD_LIBRARY_PATH):$(dos_to_unix_path $FEISTY_MEOW_BINARIES)"
     fi
   }