You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by tr...@apache.org on 2014/10/27 20:59:15 UTC
svn commit: r1634672 -
/jackrabbit/commons/filevault/trunk/vault-cli/src/main/appassembler/unix-template
Author: tripod
Date: Mon Oct 27 19:59:14 2014
New Revision: 1634672
URL: http://svn.apache.org/r1634672
Log:
JCRVLT-68 - Wrong JAVA_HOME default location for OSX Yosemite
Modified:
jackrabbit/commons/filevault/trunk/vault-cli/src/main/appassembler/unix-template
Modified: jackrabbit/commons/filevault/trunk/vault-cli/src/main/appassembler/unix-template
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-cli/src/main/appassembler/unix-template?rev=1634672&r1=1634671&r2=1634672&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-cli/src/main/appassembler/unix-template (original)
+++ jackrabbit/commons/filevault/trunk/vault-cli/src/main/appassembler/unix-template Mon Oct 27 19:59:14 2014
@@ -47,12 +47,13 @@ case "`uname`" in
CYGWIN*) cygwin=true ;;
Darwin*) darwin=true
if [ -z "$JAVA_VERSION" ] ; then
- JAVA_VERSION="CurrentJDK"
+ VERSION=""
else
+ VERSION="-v $JAVA_VERSION"
echo "Using Java version: $JAVA_VERSION"
fi
if [ -z "$JAVA_HOME" ] ; then
- JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home
+ JAVA_HOME=`/usr/libexec/java_home $JAVA_VERSION`
fi
;;
esac