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 2012/12/05 00:58:21 UTC
[3/3] git commit: BIGTOP-801. prioritize jdk over jre in bigtop-utils
javadetection
BIGTOP-801. prioritize jdk over jre in bigtop-utils javadetection
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/8f40ad75
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/8f40ad75
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/8f40ad75
Branch: refs/heads/master
Commit: 8f40ad7592e11b3f0d8deea7146b69f5d6bc60f6
Parents: ea94ffb
Author: Roman Shaposhnik <rv...@cloudera.com>
Authored: Mon Dec 3 15:38:13 2012 -0800
Committer: Roman Shaposhnik <rv...@cloudera.com>
Committed: Tue Dec 4 15:14:34 2012 -0800
----------------------------------------------------------------------
.../src/common/bigtop-utils/bigtop-detect-javahome | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/8f40ad75/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 ffd933e..6c2b6eb 100644
--- a/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome
+++ b/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome
@@ -22,12 +22,12 @@
# attempt to find java
if [ -z "$JAVA_HOME" ]; then
for candidate in \
+ /usr/lib/j2sdk1.6-sun \
/usr/lib/jvm/java-6-sun \
- /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/java-1.6.0-sun-1.6.0.*/jre/ \
/usr/lib/jvm/j2sdk1.6-oracle \
/usr/lib/jvm/j2sdk1.6-oracle/jre \
- /usr/lib/j2sdk1.6-sun \
/usr/java/jdk1.6* \
/usr/java/jre1.6* \
/Library/Java/Home \