From: Chris Koeritz <fred@gruntose.com>
Date: Mon, 14 Jul 2014 21:30:28 +0000 (-0400)
Subject: updated to stop using java 6.
X-Git-Tag: 2.140.90~772
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=7084a87e2ec6ec852d3d954f789e7f7ba248867d;p=feisty_meow.git

updated to stop using java 6.
---

diff --git a/customizing/fred/java_profile.sh b/customizing/fred/java_profile.sh
index dad2ae9b..3db3b615 100644
--- a/customizing/fred/java_profile.sh
+++ b/customizing/fred/java_profile.sh
@@ -33,11 +33,7 @@ export ANT_OPTS="-Xms512m -Xmx768m -XX:MaxPermSize=768m"
 export JAVA_BIN_PIECE=bin
 
 if [ ! -d "$JAVA_HOME" ]; then
-  # first try a recent linux version.
-  export JAVA_HOME=/usr/lib/jvm/java-6-sun
-fi
-if [ ! -d "$JAVA_HOME" ]; then
-  # try an even more recent version.
+  # try a recent version.
   export JAVA_HOME=/usr/lib/jvm/java-7-oracle
 fi
 if [ ! -d "$JAVA_HOME" ]; then