fixed an oops where we had been expecting bash to convey our functions

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

diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh
index f56af98d0209a0491919e5c764d744fac2de5d4c..1f37bb821b9608a2a08a79738da4a902b325a65d 100644 (file)
--- a/scripts/core/variables.sh
+++ b/scripts/core/variables.sh
@@ -28,23 +28,6 @@ if [ -z "$NECHUNG" ]; then
   
   ##############
   
-  # windoze sometimes needs a special home variable setup.
-  if [ "$OS" == "Windows_NT" ]; then
-    # give them a default place if they don't have one already.
-    if [ -z "$HOME" ]; then
-      export HOME=c:/home
-    fi
-    # patch home to undo cygwin style of drive letter.
-  #  export HOME=$(echo $HOME | sed -e 's/\/cygdrive\//\//g')
-    # make the home folder if it doesn't exist yet.
-    if [ ! -d $HOME ]; then
-      mkdir $HOME
-    fi
-    if [ ! -z "$SHELL_DEBUG" ]; then echo HOME is now $HOME; fi
-  fi
-  
-  ##############
-  
   # fallbacks to set crucial variables for feisty meow...
   
   # set the main root directory variable for the feisty meow codebase.
@@ -78,11 +61,6 @@ if [ -z "$NECHUNG" ]; then
   
   ##############
   
-  # include helpful functions.
-  source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"
-  
-  ##############
-  
   # user variables, sort of...  if they haven't given themselves a name yet,
   # then we will make one up for them.
   
@@ -172,11 +150,11 @@ if [ -z "$NECHUNG" ]; then
       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"
-      export PATH="$BUILD_TOP/build/bin:$PATH"
+#    export PATH="$(dos_to_msys_path $BUILD_TOP/build/bin):$PATH"
+      export PATH="$BINDIR:$PATH"
   
       # Shared libraries are located via this variable.
-  #    export LD_LIBRARY_PATH="$(dos_to_msys_path $LD_LIBRARY_PATH):$(dos_to_msys_path $BINDIR)"
+#    export LD_LIBRARY_PATH="$(dos_to_msys_path $LD_LIBRARY_PATH):$(dos_to_msys_path $BINDIR)"
       export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$BINDIR"
     fi
   }
@@ -213,7 +191,8 @@ if [ -z "$NECHUNG" ]; then
   # set the path for locating applications.  this is done after any
   # potential overrides from the user.
   #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:."
-  export PATH="$BINDIR:$FEISTY_MEOW_GENERATED:$PATH:/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/lib:/usr/games:/usr/bin:."
+  export PATH="$FEISTY_MEOW_GENERATED:$PATH:/sbin:."
+###noise! :/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/lib:/usr/games:/usr/bin:.
   
   ##############