Return-Path: X-Original-To: apmail-incubator-bigtop-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-bigtop-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 926BB9AF5 for ; Fri, 2 Mar 2012 20:32:00 +0000 (UTC) Received: (qmail 25113 invoked by uid 500); 2 Mar 2012 20:32:00 -0000 Delivered-To: apmail-incubator-bigtop-commits-archive@incubator.apache.org Received: (qmail 25087 invoked by uid 500); 2 Mar 2012 20:32:00 -0000 Mailing-List: contact bigtop-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: bigtop-dev@incubator.apache.org Delivered-To: mailing list bigtop-commits@incubator.apache.org Received: (qmail 25080 invoked by uid 99); 2 Mar 2012 20:32:00 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Mar 2012 20:32:00 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Mar 2012 20:31:59 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7E076238889B; Fri, 2 Mar 2012 20:31:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1296438 - /incubator/bigtop/trunk/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome Date: Fri, 02 Mar 2012 20:31:39 -0000 To: bigtop-commits@incubator.apache.org From: jamespage@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120302203139.7E076238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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