You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by rv...@apache.org on 2013/05/12 00:01:02 UTC
git commit: BIGTOP-984. bigtop-utils doesn't detect JAVA_HOME for
Oracle JDK 7 when packaged by Debian's tool
Updated Branches:
refs/heads/master c9726d6d3 -> 3ab42b86b
BIGTOP-984. bigtop-utils doesn't detect JAVA_HOME for Oracle JDK 7 when packaged by Debian's tool
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/3ab42b86
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/3ab42b86
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/3ab42b86
Branch: refs/heads/master
Commit: 3ab42b86b6097eb8f3a096ba13946cb6af013258
Parents: c9726d6
Author: Sean Mackrory <“mackrorysd@gmail.com”>
Authored: Fri May 10 10:07:16 2013 -0700
Committer: Roman Shaposhnik <rv...@cloudera.com>
Committed: Sat May 11 15:00:34 2013 -0700
----------------------------------------------------------------------
.../src/common/bigtop-utils/bigtop-detect-javahome | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/3ab42b86/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 f805611..de64e1d 100644
--- a/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome
+++ b/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome
@@ -32,6 +32,8 @@ if [ -z "$JAVA_HOME" ]; then
/usr/java/jre1.6* \
/usr/java/jdk1.7* \
/usr/java/jre1.7* \
+ /usr/lib/jvm/j2sdk1.7-oracle \
+ /usr/lib/jvm/j2sdk1.7-oracle/jre \
/Library/Java/Home \
/usr/java/default \
/usr/lib/jvm/default-java \