From: Chris Koeritz <fred@gruntose.com>
Date: Tue, 12 Nov 2013 18:36:45 +0000 (-0500)
Subject: updated with progfiles paths.
X-Git-Tag: 2.140.90~873
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=c59d47a263aa58aad65bb27de3d3ab79d8a3cc2e;p=feisty_meow.git

updated with progfiles paths.
---

diff --git a/customizing/fred/java_profile.sh b/customizing/fred/java_profile.sh
index 8c731ecc..69de3e2f 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.
@@ -136,3 +131,5 @@ fi
 ############################
 
 
+echo here at end of script java home is $JAVA_HOME
+echo and eclipse is $ECLIPSE_DIR