X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=examples%2Fcustom_overrides%2Ffred%2Fjava_profile.sh;h=72ae763b80f1fa361c666d6f7865b923800eeba1;hb=82dac81449c7e5fbef9d28dae22bcd8db54440a3;hp=423e99d5149dc2b262a829c25f2b846d40ae8f6f;hpb=a6d593934f34d35642cdc8a79421404560f89fe1;p=feisty_meow.git

diff --git a/examples/custom_overrides/fred/java_profile.sh b/examples/custom_overrides/fred/java_profile.sh
index 423e99d5..72ae763b 100644
--- a/examples/custom_overrides/fred/java_profile.sh
+++ b/examples/custom_overrides/fred/java_profile.sh
@@ -51,21 +51,7 @@ if [ ! -d "$JAVA_HOME" ]; then
 fi
 if [ ! -d "$JAVA_HOME" ]; then
   # try using a windows version.
-#note: this logic is untested.
-# probably will break due to space in path issues.
-  declare -a any_there=$(find "/c/Program Files/java" -type d -iname "jdk" 2>/dev/null)
-  if [ ${#any_there[*]} -gt 0 ]; then
-    (( last = ${#any_there[@]} - 1 ))
-    JAVA_HOME="${any_there[$last]}"
-  fi
-  if [ ! -d "$JAVA_HOME" ]; then
-    # if no jdk, try a jre.
-    declare -a any_there=$(find "/c/Program Files/java" -type d -iname "jre" 2>/dev/null)
-    if [ ${#any_there[*]} -gt 0 ]; then
-      (( last = ${#any_there[@]} - 1 ))
-      JAVA_HOME="${any_there[$last]}"
-    fi
-  fi
+  JAVA_HOME=/d/tools/java6-jre
 fi
 # this should go last, since it changes the bin dir.
 if [ ! -d "$JAVA_HOME" ]; then
@@ -81,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
@@ -117,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