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:34:27 UTC
svn commit: r1537312 - in
/karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main:
distribution/unix-shell/bin/karaf filtered-resources/bin/admin
filtered-resources/bin/client filtered-resources/bin/shell
Author: anierbeck
Date: Wed Oct 30 21:34:27 2013
New Revision: 1537312
URL: http://svn.apache.org/r1537312
Log:
[KARAF-2541] - On Mac OS locate the JAVA_HOME
Modified:
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/admin
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/client
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/shell
Modified: karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf?rev=1537312&r1=1537311&r2=1537312&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf (original)
+++ karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf Wed Oct 30 21:34:27 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`
Modified: karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/admin
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/admin?rev=1537312&r1=1537311&r2=1537312&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/admin (original)
+++ karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/admin Wed Oct 30 21:34:27 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/branches/karaf-2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/client
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/client?rev=1537312&r1=1537311&r2=1537312&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/client (original)
+++ karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/client Wed Oct 30 21:34:27 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/branches/karaf-2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/shell
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/shell?rev=1537312&r1=1537311&r2=1537312&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/shell (original)
+++ karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/shell Wed Oct 30 21:34:27 2013
@@ -178,7 +178,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`