Repository: bigtop Updated Branches: refs/heads/master ad1c0a6be -> f76a845ed
BIGTOP-1506. bigtop-utils won't detect JAVA_HOME in some cases Signed-off-by: Mark Grover <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/f76a845e Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/f76a845e Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/f76a845e Branch: refs/heads/master Commit: f76a845ed2ac09c7857172f9a6796adf8ebb2079 Parents: ad1c0a6 Author: Konstantin Boudnik <[email protected]> Authored: Thu Oct 30 15:18:39 2014 -0700 Committer: Mark Grover <[email protected]> Committed: Fri Oct 31 10:19:31 2014 -0700 ---------------------------------------------------------------------- bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/f76a845e/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 1d5608d..819a790 100644 --- a/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome +++ b/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome @@ -40,7 +40,8 @@ JAVA7_HOME_CANDIDATES='\ /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* \
