Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 62388 invoked from network); 4 Oct 2006 18:55:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 4 Oct 2006 18:55:52 -0000 Received: (qmail 77558 invoked by uid 500); 4 Oct 2006 18:55:46 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 77503 invoked by uid 500); 4 Oct 2006 18:55:46 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 77481 invoked by uid 99); 4 Oct 2006 18:55:45 -0000 Received: from idunn.apache.osuosl.org (HELO idunn.apache.osuosl.org) (140.211.166.84) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Oct 2006 11:55:45 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=5.0 tests=ALL_TRUSTED,NO_REAL_NAME Received: from [140.211.166.113] ([140.211.166.113:61578] helo=eris.apache.org) by idunn.apache.osuosl.org (ecelerity 2.1.1.8 r(12930)) with ESMTP id 57/41-20288-0B304254 for ; Wed, 04 Oct 2006 11:55:44 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 1D3A51A981A; Wed, 4 Oct 2006 11:55:42 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r452974 - /geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/setjavaenv.sh Date: Wed, 04 Oct 2006 18:55:41 -0000 To: scm@geronimo.apache.org From: dain@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061004185542.1D3A51A981A@eris.apache.org> X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: dain Date: Wed Oct 4 11:55:41 2006 New Revision: 452974 URL: http://svn.apache.org/viewvc?view=rev&rev=452974 Log: OSX doesn't have a jre dir so set it to JAVA_HOME Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/setjavaenv.sh Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/setjavaenv.sh URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/setjavaenv.sh?view=diff&rev=452974&r1=452973&r2=452974 ============================================================================== --- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/setjavaenv.sh (original) +++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/setjavaenv.sh Wed Oct 4 11:55:41 2006 @@ -45,7 +45,11 @@ exit 1 fi if [ -z "$JRE_HOME" ]; then - JRE_HOME="$JAVA_HOME/jre" + if [ -d "$JRE_HOME/jre" ]; then + JRE_HOME="$JAVA_HOME/jre" + else + JRE_HOME="$JAVA_HOME" + fi fi # If we're running under jdb, we need a full jdk.