From: Chris Koeritz <fred@gruntose.com>
Date: Wed, 17 Jun 2020 15:26:45 +0000 (-0400)
Subject: updated to use java itself to get JAVA_HOME
X-Git-Tag: 2.140.134~19^2~6^2~1
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=cc33410b568962f385e19cf355994875fc7b8683;p=feisty_meow.git

updated to use java itself to get JAVA_HOME

this is the best approach possible if the desired version of java is already in your path.
our previous implementation is a guessing game and is dysfunctional.  "is", since it's still in place if the call to java fails.
---

diff --git a/scripts/customize/fred/java_profile.sh b/scripts/customize/fred/java_profile.sh
index 92a4f52a..f98030a6 100644
--- a/scripts/customize/fred/java_profile.sh
+++ b/scripts/customize/fred/java_profile.sh
@@ -22,20 +22,23 @@ function intuition_failure()
 
 ############################
 
-# set some fairly liberal limits for ant.
-#no. export ANT_OPTS="-Xms512m -Xmx768m -XX:MaxPermSize=768m"
-
-############################
-
 # start guessing some settings...
 
+# whatever we figure out, we want to export the java home variable.
+export JAVA_HOME
+
 # this bin portion works for most javas...
 export JAVA_BIN_PIECE=bin
 
-# try using java itself if we can.
-#if [ ! -d "$JAVA_HOME" ]; then
+# try using java itself to locate the JAVA_HOME if we can.
+if [ ! -d "$JAVA_HOME" ]; then
+  JAVA_HOME=$(java -XshowSettings:properties -version 2>&1 | grep -i java.home | sed -e 's/.*java.home = \(.*\)$/\1/')
+fi
+
+# if that didn't work, then we try a series of random bizarro places where
+# we have seen java live before.
 
-#fi
+#hmmm: below list is way out of date.  we really hope the first attempt above works.
 
 if [ ! -d "$JAVA_HOME" ]; then
   # try a recent version.