Author: jamespage
Date: Fri Mar 2 20:31:39 2012
New Revision: 1296438
URL: http://svn.apache.org/viewvc?rev=1296438&view=rev
Log:
BIGTOP-374: Pickup new multiarch based locations for openjdk.
Modified:
incubator/bigtop/trunk/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome
Modified:
incubator/bigtop/trunk/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome?rev=1296438&r1=1296437&r2=1296438&view=diff
==============================================================================
---
incubator/bigtop/trunk/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome
(original)
+++
incubator/bigtop/trunk/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome
Fri Mar 2 20:31:39 2012
@@ -33,7 +33,8 @@ if [ -z "$JAVA_HOME" ]; then
/usr/lib/jvm/default-java \
/usr/lib/jvm/java-openjdk \
/usr/lib/jvm/jre-openjdk \
- /usr/lib/jvm/java-1.6.0-openjdk-1.6.* \
+ /usr/lib/jvm/java-1.6.0-openjdk \
+ /usr/lib/jvm/java-1.6.0-openjdk-* \
/usr/lib/jvm/jre-1.6.0-openjdk* ; do
if [ -e $candidate/bin/java ]; then
export JAVA_HOME=$candidate
