You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by an...@apache.org on 2013/10/30 22:30:21 UTC
svn commit: r1537310 - in
/karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin:
client instance karaf
Author: anierbeck
Date: Wed Oct 30 21:30:21 2013
New Revision: 1537310
URL: http://svn.apache.org/r1537310
Log:
[KARAF-2541] - On Mac OS locate the JAVA_HOME
Modified:
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/client
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf
Modified: karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/client
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/client?rev=1537310&r1=1537309&r2=1537310&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/client (original)
+++ karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/client Wed Oct 30 21:30:21 2013
@@ -179,7 +179,7 @@ locateJava() {
fi
if [ "x$JAVA_HOME" = "x" ] && [ "$darwin" = "true" ]; then
- JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
+ JAVA_HOME=$(/usr/libexec/java_home)
fi
if [ "x$JAVA" = "x" ] && [ -r /etc/gentoo-release ] ; then
JAVA_HOME=`java-config --jre-home`
Modified: karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance?rev=1537310&r1=1537309&r2=1537310&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance (original)
+++ karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance Wed Oct 30 21:30:21 2013
@@ -179,7 +179,7 @@ locateJava() {
fi
if [ "x$JAVA_HOME" = "x" ] && [ "$darwin" = "true" ]; then
- JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
+ JAVA_HOME=$(/usr/libexec/java_home)
fi
if [ "x$JAVA" = "x" ] && [ -r /etc/gentoo-release ] ; then
JAVA_HOME=`java-config --jre-home`
Modified: karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf?rev=1537310&r1=1537309&r2=1537310&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf (original)
+++ karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf Wed Oct 30 21:30:21 2013
@@ -186,7 +186,7 @@ locateJava() {
fi
if [ "x$JAVA_HOME" = "x" ] && [ "$darwin" = "true" ]; then
- JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
+ JAVA_HOME=$(/usr/libexec/java_home)
fi
if [ "x$JAVA" = "x" ] && [ -r /etc/gentoo-release ] ; then
JAVA_HOME=`java-config --jre-home`