X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Fvariables.sh;h=9e3d1312eeb6b238c3cb4eb31fb92469f0a23b75;hb=e82460bf4ea6b2beb2c9923420ac36e5a2da0709;hp=d8b44bc845aeaa7b2451473caabcb822bc1e83bb;hpb=f1e81455b3b10bbf8ffa5cb2c7827997c5fc686e;p=feisty_meow.git

diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh
index d8b44bc8..9e3d1312 100644
--- a/scripts/core/variables.sh
+++ b/scripts/core/variables.sh
@@ -9,8 +9,6 @@
 
 ##############
 
-#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.
@@ -30,6 +28,17 @@
 return 0
   }
 
+  # switches from an X:/ form to a /cygdrive/X/path form.  this is only useful
+  # for the cygwin environment currently.
+  # defined here rather than in functions.sh since we need it when setting variables
+  # and cannot count on load order during a fresh startup in some circumstances.
+  function dos_to_unix_path() {
+    # we always remove dos slashes in favor of forward slashes.
+#old:    echo "$1" | sed -e 's/\\/\//g' | sed -e 's/\([a-zA-Z]\):\/\(.*\)/\/\1\/\2/'
+         echo "$1" | sed -e 's/\\/\//g' | sed -e 's/\([a-zA-Z]\):\/\(.*\)/\/cygdrive\/\1\/\2/'
+  }
+
+
 
 ##############
 
@@ -123,9 +132,7 @@ define_yeti_variable DEFAULT_FEISTYMEOW_ORG_DIR=/opt/feistymeow.org
     mkdir -p "$FEISTY_MEOW_GENERATED_STORE"
   fi
   # set up our effluent outsourcing valves.
-  if [ -z "$TEMPORARIES_PILE" ]; then
-    define_yeti_variable TEMPORARIES_PILE="$FEISTY_MEOW_GENERATED_STORE/temporaries"
-  fi
+  define_yeti_variable TEMPORARIES_PILE="$FEISTY_MEOW_GENERATED_STORE/temporaries"
   if [ ! -d "$TEMPORARIES_PILE" ]; then
     mkdir -p "$TEMPORARIES_PILE"
   fi
@@ -243,7 +250,7 @@ define_yeti_variable DEFAULT_FEISTYMEOW_ORG_DIR=/opt/feistymeow.org
   # initializes the feisty meow build variables, if possible.
   function initialize_build_variables()
   {
-    found_build_vars=0
+    local found_build_vars=nope
     # we need to know the feisty meow directory, or we bail.
     if [ -z "$FEISTY_MEOW_APEX" ]; then return; fi
     # pick from our expected generator folder, but make sure it's there...
@@ -251,10 +258,10 @@ define_yeti_variable DEFAULT_FEISTYMEOW_ORG_DIR=/opt/feistymeow.org
     if [ -f "$buildvars" ]; then
       # yep, that one looks good, so pull in the build defs.
       source "$buildvars" "$buildvars"
-      found_build_vars=1
+      found_build_vars=true
     fi
     # now augment the environment if we found our build variables.
-    if [ $found_build_vars == 1 ]; then
+    if [ $found_build_vars == true ]; then
       # the binary directory contains our collection of handy programs.
       define_yeti_variable FEISTY_MEOW_BINARIES=$TARGETS_STORE
       # add binaries created within build to the path.
@@ -281,7 +288,8 @@ define_yeti_variable DEFAULT_FEISTYMEOW_ORG_DIR=/opt/feistymeow.org
   
   # 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_LOADING_DOCK):$PATH:$(find /usr/local/games -maxdepth 1 -type d -exec echo -n {}: ';' 2>/dev/null)/sbin"
+#old:  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"
+  define_yeti_variable PATH="$PATH:$(find /usr/local/games -maxdepth 1 -type d -exec echo -n {}: ';' 2>/dev/null)/sbin"
   
   ##############
 
@@ -323,20 +331,20 @@ export EDITOR
 # going to work well unless they can be prevented from forking the process
 # off.
 if [ -z "$EDITOR" ]; then
-  EDITOR="$(which gvim)"
+  EDITOR="$(whichable gvim)"
   if [ ! -z "$EDITOR" ]; then
     # if we found gvim, then add in the no forking flag.
     EDITOR+=" --nofork"
   fi
 fi
 if [ -z "$EDITOR" ]; then
-  EDITOR="$(which vim)"
+  EDITOR="$(whichable vim)"
 fi
 if [ -z "$EDITOR" ]; then
-  EDITOR="$(which vi)"
+  EDITOR="$(whichable vi)"
 fi
 if [ -z "$EDITOR" ]; then
-  EDITOR="$(which emacs)"
+  EDITOR="$(whichable emacs)"
 fi
 ####
 # out of ideas about editors at this point.