can't use dos paths with msys in PATH apparently.

[feisty_meow.git] / examples / custom_overrides / fred / java_profile.sh

diff --git a/examples/custom_overrides/fred/java_profile.sh b/examples/custom_overrides/fred/java_profile.sh
index 2090de2d8830c517164019d8502214fc7e965c07..72ae763b80f1fa361c666d6f7865b923800eeba1 100644 (file)
--- a/examples/custom_overrides/fred/java_profile.sh
+++ b/examples/custom_overrides/fred/java_profile.sh
@@ -51,7 +51,7 @@ if [ ! -d "$JAVA_HOME" ]; then
 fi
 if [ ! -d "$JAVA_HOME" ]; then
   # try using a windows version.
-  JAVA_HOME=d:/tools/java6-jre
+  JAVA_HOME=/d/tools/java6-jre
 fi
 # this should go last, since it changes the bin dir.
 if [ ! -d "$JAVA_HOME" ]; then
@@ -67,6 +67,20 @@ fi
 
 ############################
 
+if [ ! -d "$JDK_HOME" ]; then
+  # try using a windows version.
+  JDK_HOME="/d/tools/java6-jdk"
+  if [ -d "$JDK_HOME/jre" ]; then
+    # reset java home.
+    JAVA_HOME="$JDK_HOME/jre"
+  fi
+fi
+if [ ! -d "$JDK_HOME" ]; then
+  intuition_failure JDK_HOME
+fi
+
+############################
+
 # intuit where we have our local eclipse.
 if [ ! -d "$ECLIPSE_DIR" ]; then
   export ECLIPSE_DIR=/usr/local/eclipse_jee
@@ -82,13 +96,13 @@ if [ ! -d "$ECLIPSE_DIR" ]; then
   ECLIPSE_DIR="/c/Program Files/eclipse"
 fi
 if [ ! -d "$ECLIPSE_DIR" ]; then
-  ECLIPSE_DIR="c:/tools/eclipse"
+  ECLIPSE_DIR="/c/tools/eclipse"
 fi
 if [ ! -d "$ECLIPSE_DIR" ]; then
-  ECLIPSE_DIR="d:/tools/eclipse"
+  ECLIPSE_DIR="/d/tools/eclipse"
 fi
 if [ ! -d "$ECLIPSE_DIR" ]; then
-  ECLIPSE_DIR="e:/tools/eclipse"
+  ECLIPSE_DIR="/e/tools/eclipse"
 fi
 # final option is to whine.
 if [ ! -d "$ECLIPSE_DIR" -a -z "$(whichable eclipse 2>/dev/null)" ]; then
@@ -103,6 +117,10 @@ fi
 if [ ! -z "$JAVA_HOME" ]; then
   export PATH=$JAVA_HOME/$JAVA_BIN_PIECE:$PATH
 fi
+if [ ! -z "$JDK_HOME" ]; then
+#may have to do bin piece if support mac with jdk bit.
+  export PATH=$JDK_HOME/bin:$PATH
+fi
 if [ ! -z "$ECLIPSE_DIR" ]; then
   export PATH=$ECLIPSE_DIR:$PATH
 fi