You are viewing a plain text version of this content. The canonical link for it is here.

Posted to scm@geronimo.apache.org by da...@apache.org on 2006/10/04 20:55:41 UTC

svn commit: r452974 - /geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/setjavaenv.sh

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.