You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by ma...@apache.org on 2015/01/26 15:18:01 UTC
bigtop git commit: BIGTOP-1589. Prioritization is broken in
bigtop-detect-javahome
Repository: bigtop
Updated Branches:
refs/heads/master c6028e77a -> 6a70f45cd
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/6a70f45c
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/6a70f45c
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/6a70f45c
Branch: refs/heads/master
Commit: 6a70f45cdcd7d833811597ba9de09a0a57ffba23
Parents: c6028e7
Author: Sean Mackrory <ma...@apache.org>
Authored: Thu Jan 22 16:32:16 2015 -0700
Committer: Sean Mackrory <ma...@apache.org>
Committed: Mon Jan 26 07:17:41 2015 -0700
----------------------------------------------------------------------
.../common/bigtop-utils/bigtop-detect-javahome | 79 +++++++++++---------
1 file changed, 42 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/6a70f45c/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 819a790..d40c70c 100644
--- a/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome
+++ b/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome
@@ -20,56 +20,61 @@
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/java-1.6.0-sun-1.6.0.*/jre \
- /usr/lib/jvm/j2sdk1.6-oracle \
- /usr/lib/jvm/j2sdk1.6-oracle/jre \
- /usr/java/jdk1.6* \
- /usr/java/jre1.6*'
+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/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*'
+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* \
- /usr/lib/jvm/j2sdk1.7-oracle \
- /usr/lib/jvm/j2sdk1.7-oracle/jre \
- /usr/lib/jvm/java-7-oracle* \
- /usr/lib/jdk7-latest'
+JAVA7_HOME_CANDIDATES=(
+ '/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/jdk7-latest'
+)
-OPENJAVA7_HOME_CANDIDATES='\
- /usr/lib/jvm/java-1.7.0-openjdk* \
- /usr/lib/jvm/java-7-openjdk*'
+OPENJAVA7_HOME_CANDIDATES=(
+ '/usr/lib/jvm/java-1.7.0-openjdk*'
+ '/usr/lib/jvm/java-7-openjdk*'
+)
-MISCJAVA_HOME_CANDIDATES='\
- /Library/Java/Home \
- /usr/java/default \
- /usr/lib/jvm/default-java \
- /usr/lib/jvm/java-openjdk \
- /usr/lib/jvm/jre-openjdk'
+MISCJAVA_HOME_CANDIDATES=(
+ '/Library/Java/Home'
+ '/usr/java/default'
+ '/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) 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 \
- $JAVA7_HOME_CANDIDATES \
- $MISCJAVA_HOME_CANDIDATES \
- $OPENJAVA7_HOME_CANDIDATES \
- $OPENJAVA6_HOME_CANDIDATES"
+ *) JAVA_HOME_CANDIDATES="${JAVA6_HOME_CANDIDATES[@]}
+ ${JAVA7_HOME_CANDIDATES[@]}
+ ${MISCJAVA_HOME_CANDIDATES[@]}
+ ${OPENJAVA7_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_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