updated for finding jdk on winders too.

[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 0f25a7ac3988bba13333c14bcd1e47d8974f4d09..506cc518d047eebc7237f2a5f92590784d549f6b 100644 (file)
--- a/examples/custom_overrides/fred/java_profile.sh
+++ b/examples/custom_overrides/fred/java_profile.sh
@@ -6,6 +6,17 @@
 
 ############################
 
+function whichable()
+{
+  to_find="$1"; shift
+  which which &>/dev/null
+  if [ $? -ne 0 ]; then
+    # there is no which command here.  we produce nothing due to this.
+    echo
+  fi
+  echo $(which $to_find)
+}
+
 # this reports when we have totally failed to figure out where a folder
 # is actually located on the machine.
 function intuition_failure()
@@ -40,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
@@ -63,13 +60,27 @@ if [ ! -d "$JAVA_HOME" ]; then
   JAVA_BIN_PIECE=Commands
 fi
 # last thing is to tell them we couldn't find it.
-if [ ! -d "$JAVA_HOME" -a -z "$(which java)" ]; then
+if [ ! -d "$JAVA_HOME" -a -z "$(whichable java 2>/dev/null)" ]; then
   intuition_failure JAVA_HOME
   unset JAVA_BIN_PIECE
 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
@@ -85,16 +96,16 @@ 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 "$(which eclipse)" ]; then
+if [ ! -d "$ECLIPSE_DIR" -a -z "$(whichable eclipse 2>/dev/null)" ]; then
   intuition_failure ECLIPSE_DIR
 fi
 
@@ -106,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