changes accidentally checked into main branch

[feisty_meow.git] / scripts / customize / fred / java_profile.sh

diff --git a/scripts/customize/fred/java_profile.sh b/scripts/customize/fred/java_profile.sh
index 92a4f52a6bfb4e88391fd7b133270a60d45417ef..7c4ce0c97c737e776cb8a8033647786210056741 100644 (file)
--- 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
 
-#fi
+# if that didn't work, then we try a series of random bizarro places where
+# we have seen java live before.
+
+#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.
@@ -132,6 +135,10 @@ if [ ! -z "$ECLIPSE_DIR" ]; then
   fi
   export PATH=$e:$PATH
 fi
+# add in our personal bin path.
+if [ -d "/usr/local/fred/bin" ]; then
+  export PATH=/usr/local/fred/bin:$PATH
+fi
 
 ############################