dion 2004/02/03 10:33:58
Modified: src/bin Tag: MAVEN-1_0-BRANCH maven
Log:
Apply MAVEN-1130: Add JAVA_HOME convenience in shell script for OSX users
Revision Changes Path
No revision
No revision
1.31.4.1 +11 -2 maven/src/bin/maven
Index: maven
===================================================================
RCS file: /home/cvs/maven/src/bin/maven,v
retrieving revision 1.31
retrieving revision 1.31.4.1
diff -u -r1.31 -r1.31.4.1
--- maven 25 Sep 2003 04:08:25 -0000 1.31
+++ maven 3 Feb 2004 18:33:58 -0000 1.31.4.1
@@ -18,7 +18,16 @@
darwin=false;
case "`uname`" in
CYGWIN*) cygwin=true ;;
- Darwin*) darwin=true ;;
+ Darwin*) darwin=true
+ if [ -z "$JAVA_VERSION" ] ; then
+ JAVA_VERSION="CurrentJDK"
+ else
+ echo "Using Java version: $JAVA_VERSION"
+ fi
+ if [ -z "$JAVA_HOME" ] ; then
+
JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home
+ fi
+ ;;
esac
if [ -z "$MAVEN_HOME" ] ; then
@@ -112,7 +121,7 @@
# For Darwin, use classes.jar for TOOLS_JAR
TOOLS_JAR="${JAVA_HOME}/lib/tools.jar"
if $darwin; then
-
TOOLS_JAR="/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Classes/classes.jar"
+
TOOLS_JAR="/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Classes/classes.jar"
fi
MAIN_CLASS=com.werken.forehead.Forehead
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
