X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=customizing%2Ffred%2Fjava_profile.sh;h=dad2ae9b9d8a561ae20b9540e7edfe9166260e33;hb=f436a09a053981ca5e6f5ff249c1c08f94cc56ba;hp=f9268a015adb5b9de99591e41d5501452b784e16;hpb=7381dff08b01e224a5c8c9e99b7d3bc317efdb98;p=feisty_meow.git

diff --git a/customizing/fred/java_profile.sh b/customizing/fred/java_profile.sh
index f9268a01..dad2ae9b 100644
--- a/customizing/fred/java_profile.sh
+++ b/customizing/fred/java_profile.sh
@@ -8,17 +8,6 @@
 
 source $FEISTY_MEOW_SCRIPTS/core/functions.sh
 
-#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()
@@ -54,6 +43,12 @@ fi
 if [ ! -d "$JAVA_HOME" ]; then
   JAVA_HOME="$(ls -d c:/tools/*jdk* 2>/dev/null)"
 fi
+if [ ! -d "$JAVA_HOME" ]; then
+  JAVA_HOME="$(ls -d "c:/Program Files"/*jdk* 2>/dev/null)"
+fi
+if [ ! -d "$JAVA_HOME" ]; then
+  JAVA_HOME="$(ls -d "c:/Program Files (x86)"/*jdk* 2>/dev/null)"
+fi
 if [ ! -d "$JAVA_HOME" ]; then
   if [ ! -z "$(grep -i 'd:' /proc/mounts 2>/dev/null)" ]; then
     # try using a windows version.
@@ -91,12 +86,12 @@ if [ ! -d "$ECLIPSE_DIR" ]; then
   ECLIPSE_DIR="c:/tools/eclipse"
 fi
 if [ ! -d "$ECLIPSE_DIR" ]; then
-  if [ ! -z "$(grep -i 'd:' /proc/mounts)" ]; then
+  if [ ! -z "$(grep -i 'd:' /proc/mounts 2>/dev/null)" ]; then
     ECLIPSE_DIR="d:/tools/eclipse"
   fi
 fi
 if [ ! -d "$ECLIPSE_DIR" ]; then
-  if [ ! -z "$(grep -i 'e:' /proc/mounts)" ]; then
+  if [ ! -z "$(grep -i 'e:' /proc/mounts 2>/dev/null)" ]; then
     ECLIPSE_DIR="e:/tools/eclipse"
   fi
 fi
@@ -135,4 +130,5 @@ fi
 
 ############################
 
+#echo "java_profile: JAVA_HOME='$JAVA_HOME' ECLIPSE_DIR='$ECLIPSE_DIR'"