Repository: bigtop Updated Branches: refs/heads/master abd615cc6 -> 8fafdd0c4
BIGTOP-1589. Prioritization is broken in bigtop-detect-javahome Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/8fafdd0c Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/8fafdd0c Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/8fafdd0c Branch: refs/heads/master Commit: 8fafdd0c47162187d98685bb69e25fdac346c9bc Parents: 23b95eb Author: Sean Mackrory <[email protected]> Authored: Mon Feb 9 12:11:59 2015 -0700 Committer: Sean Mackrory <[email protected]> Committed: Wed Feb 25 10:06:27 2015 -0800 ---------------------------------------------------------------------- .../common/bigtop-utils/bigtop-detect-javahome | 41 ++++++++++---------- 1 file changed, 20 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/8fafdd0c/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 d40c70c..b5a90fc 100644 --- a/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome +++ b/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome @@ -23,32 +23,31 @@ BIGTOP_DEFAULTS_DIR=${BIGTOP_DEFAULTS_DIR-/etc/default} 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/java-1.6.0-sun-1.6.0.*/jre' + '/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*' + '/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*' + '/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*' + '/usr/java/jdk1.7' + '/usr/java/jre1.7' '/usr/lib/jvm/j2sdk1.7-oracle' '/usr/lib/jvm/j2sdk1.7-oracle/jre' - '/usr/lib/jvm/java-7-oracle*' + '/usr/lib/jvm/java-7-oracle' '/usr/lib/jdk7-latest' ) OPENJAVA7_HOME_CANDIDATES=( - '/usr/lib/jvm/java-1.7.0-openjdk*' - '/usr/lib/jvm/java-7-openjdk*' + '/usr/lib/jvm/java-1.7.0-openjdk' + '/usr/lib/jvm/java-7-openjdk' ) MISCJAVA_HOME_CANDIDATES=( @@ -59,25 +58,25 @@ MISCJAVA_HOME_CANDIDATES=( '/usr/lib/jvm/jre-openjdk' ) -case $BIGTOP_JAVA_MAJOR in - 6) JAVA_HOME_CANDIDATES="${JAVA6_HOME_CANDIDATES[@]}" +case ${BIGTOP_JAVA_MAJOR} in + 6) JAVA_HOME_CANDIDATES=(${JAVA6_HOME_CANDIDATES[@]}) ;; - 7) JAVA_HOME_CANDIDATES="${JAVA7_HOME_CANDIDATES[@]} ${OPENJAVA7_HOME_CANDIDATES[@]}" + 7) JAVA_HOME_CANDIDATES=(${JAVA7_HOME_CANDIDATES[@]} ${OPENJAVA7_HOME_CANDIDATES[@]}) ;; - *) JAVA_HOME_CANDIDATES="${JAVA6_HOME_CANDIDATES[@]} + *) JAVA_HOME_CANDIDATES=(${JAVA6_HOME_CANDIDATES[@]} ${JAVA7_HOME_CANDIDATES[@]} ${MISCJAVA_HOME_CANDIDATES[@]} ${OPENJAVA7_HOME_CANDIDATES[@]} - ${OPENJAVA6_HOME_CANDIDATES[@]}" + ${OPENJAVA6_HOME_CANDIDATES[@]}) ;; esac # attempt to find java -if [ -z "$JAVA_HOME" ]; then - for candidate_regex in "${JAVA_HOME_CANDIDATES[@]}" ; do - for candidate in `ls -rd $candidate_regex 2>/dev/null`; do - if [ -e $candidate/bin/java ]; then - export JAVA_HOME=$candidate +if [ -z "${JAVA_HOME}" ]; then + for candidate_regex in ${JAVA_HOME_CANDIDATES[@]} ; do + for candidate in `ls -rvd ${candidate_regex}* 2>/dev/null`; do + if [ -e ${candidate}/bin/java ]; then + export JAVA_HOME=${candidate} break 2 fi done
