BIGTOP-2047. detect JAVA_HOME for JDK8, remove obsolete detection code (JDK6/oracle JDK)
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/b8959afe Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/b8959afe Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/b8959afe Branch: refs/heads/master Commit: b8959afe650365685bd95301cf567d9990f9856c Parents: 599207f Author: Roman Shaposhnik <[email protected]> Authored: Fri Mar 24 11:27:51 2017 -0700 Committer: Roman Shaposhnik <[email protected]> Committed: Fri Mar 24 11:27:51 2017 -0700 ---------------------------------------------------------------------- .../common/bigtop-utils/bigtop-detect-javahome | 46 +++++++++++--------- 1 file changed, 25 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/b8959afe/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome b/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome index b5a90fc..46dca01 100644 --- a/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome +++ b/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome @@ -20,22 +20,6 @@ BIGTOP_DEFAULTS_DIR=${BIGTOP_DEFAULTS_DIR-/etc/default} [ -n "${BIGTOP_DEFAULTS_DIR}" -a -r ${BIGTOP_DEFAULTS_DIR}/bigtop-utils ] && . ${BIGTOP_DEFAULTS_DIR}/bigtop-utils -JAVA6_HOME_CANDIDATES=( - '/usr/lib/j2sdk1.6-sun' - '/usr/lib/jvm/java-6-sun' - '/usr/lib/jvm/java-1.6.0-sun-1.6.0' - '/usr/lib/jvm/j2sdk1.6-oracle' - '/usr/lib/jvm/j2sdk1.6-oracle/jre' - '/usr/java/jdk1.6' - '/usr/java/jre1.6' -) - -OPENJAVA6_HOME_CANDIDATES=( - '/usr/lib/jvm/java-1.6.0-openjdk' - '/usr/lib/jvm/java-1.6.0-openjdk-' - '/usr/lib/jvm/jre-1.6.0-openjdk' -) - JAVA7_HOME_CANDIDATES=( '/usr/java/jdk1.7' '/usr/java/jre1.7' @@ -50,24 +34,45 @@ OPENJAVA7_HOME_CANDIDATES=( '/usr/lib/jvm/java-7-openjdk' ) +JAVA8_HOME_CANDIDATES=( + '/usr/java/jdk1.8' + '/usr/java/jre1.8' + '/usr/lib/jvm/j2sdk1.8-oracle' + '/usr/lib/jvm/j2sdk1.8-oracle/jre' + '/usr/lib/jvm/java-8-oracle' + '/usr/lib/jdk8-latest' +) + +OPENJAVA8_HOME__CANDIDATES=( + '/usr/lib/jvm/java-1.8.0-openjdk-amd64' + '/usr/lib/jvm/java-1.8.0-openjdk-ppc64el' + '/usr/lib/jvm/java-1.8.0-openjdk' + '/usr/lib64/jvm/java-1.8.0-openjdk-1.8.0' +) + MISCJAVA_HOME_CANDIDATES=( '/Library/Java/Home' '/usr/java/default' + '/usr/lib/jvm/java' + '/usr/lib/jvm/jre' '/usr/lib/jvm/default-java' '/usr/lib/jvm/java-openjdk' '/usr/lib/jvm/jre-openjdk' ) case ${BIGTOP_JAVA_MAJOR} in - 6) JAVA_HOME_CANDIDATES=(${JAVA6_HOME_CANDIDATES[@]}) + 6) echo "Java 6 is no longer supported. Please upgrade" + exit 1 ;; 7) JAVA_HOME_CANDIDATES=(${JAVA7_HOME_CANDIDATES[@]} ${OPENJAVA7_HOME_CANDIDATES[@]}) ;; - *) JAVA_HOME_CANDIDATES=(${JAVA6_HOME_CANDIDATES[@]} + 8) JAVA_HOME_CANDIDATES=(${JAVA8_HOME_CANDIDATES[@]} ${OPENJAVA8_HOME_CANDIDATES[@]}) + ;; + *) JAVA_HOME_CANDIDATES=(${JAVA8_HOME_CANDIDATES[@]} ${JAVA7_HOME_CANDIDATES[@]} ${MISCJAVA_HOME_CANDIDATES[@]} - ${OPENJAVA7_HOME_CANDIDATES[@]} - ${OPENJAVA6_HOME_CANDIDATES[@]}) + ${OPENJAVA8_HOME_CANDIDATES[@]} + ${OPENJAVA7_HOME_CANDIDATES[@]}) ;; esac @@ -82,4 +87,3 @@ if [ -z "${JAVA_HOME}" ]; then done done fi -
