updated to get closer to building using cygwin, which is difficult because

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

diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh
index f40dfc4f81dc76486b5f320fb4b7bb030e33ac28..de83d76d6d320e07e14ff4b9153896241f9e902f 100644 (file)
--- a/scripts/core/variables.sh
+++ b/scripts/core/variables.sh
@@ -37,6 +37,22 @@ if [ -z "$NECHUNG" ]; then
   fi
   export IS_DARWIN=$(echo $OSTYPE | grep -i darwin)
   
+  ##############
+
+  # guess the current platform.
+  IS_UNIX=$(uname | grep -i linux)
+  if [ -z "$IS_UNIX" ]; then IS_UNIX=$(uname | grep -i unix); fi
+  if [ -z "$IS_UNIX" ]; then IS_UNIX=$(uname | grep -i darwin); fi
+  IS_DOS=$(uname | grep -i ming)
+  if [ -z "$IS_DOS" ]; then IS_DOS=$(uname | grep -i cygwin); fi
+
+  # now if we're stuck in DOS, try to determine the type of system.
+  if [ ! -z "$IS_DOS" ]; 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)
+  fi
+
   ##############
   
   # fallbacks to set crucial variables for feisty meow...
@@ -161,7 +177,7 @@ 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="$(dos_to_unix_path $BINDIR):$(dos_to_unix_path $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:.