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

diff --git a/examples/custom_overrides/fred/java_profile.sh b/examples/custom_overrides/fred/java_profile.sh
index d5cbc503..72ae763b 100644
--- a/examples/custom_overrides/fred/java_profile.sh
+++ b/examples/custom_overrides/fred/java_profile.sh
@@ -6,10 +6,25 @@
 
 ############################
 
+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()
 {
   missing="$1"; shift
-  echo "We cannot intuit your $missing variable for this host."
+  if [ ! -z "$SHELL_DEBUG" ]; then
+    echo "Could not intuit '$missing' variable."
+  fi
   # remove the variable because its value is busted.
   unset $missing
 }
@@ -36,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
@@ -59,14 +60,24 @@ 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" ]; then
-  if [ ! -z "$(which java)" ]; then
-    echo "JAVA_HOME unknown, but java is in path."
-  else
-    intuition_failure JAVA_HOME
-    unset JAVA_BIN_PIECE
+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
 
 ############################
 
@@ -94,12 +105,8 @@ if [ ! -d "$ECLIPSE_DIR" ]; then
   ECLIPSE_DIR="/e/tools/eclipse"
 fi
 # final option is to whine.
-if [ ! -d "$ECLIPSE_DIR" ]; then
-  if [ ! -z "$(which eclipse)" ]; then
-    echo "ECLIPSE_DIR unknown, but eclipse is in path."
-  else
-    intuition_failure ECLIPSE_DIR;
-  fi
+if [ ! -d "$ECLIPSE_DIR" -a -z "$(whichable eclipse 2>/dev/null)" ]; then
+  intuition_failure ECLIPSE_DIR
 fi
 
 ############################
@@ -110,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