Author: bentmann
Date: Thu Feb 24 19:47:42 2011
New Revision: 1074273
URL: http://svn.apache.org/viewvc?rev=1074273&view=rev
Log:
[MNG-5020] JAVA_HOME auto discovery
Submitted by: Maciej Mazur
o Extended original patch to other run scripts as well
Modified:
maven/maven-3/trunk/apache-maven/src/bin/mvn
maven/maven-3/trunk/apache-maven/src/bin/mvnDebug
maven/maven-3/trunk/apache-maven/src/bin/mvnyjp
Modified: maven/maven-3/trunk/apache-maven/src/bin/mvn
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/apache-maven/src/bin/mvn?rev=1074273&r1=1074272&r2=1074273&view=diff
==============================================================================
--- maven/maven-3/trunk/apache-maven/src/bin/mvn (original)
+++ maven/maven-3/trunk/apache-maven/src/bin/mvn Thu Feb 24 19:47:42 2011
@@ -114,6 +114,21 @@ if $mingw ; then
# TODO classpath?
fi
+if [ -z "$JAVA_HOME" ]; then
+ javaExecutable="`which javac`"
+ if [ -n "$javaExecutable" -a ! "`expr \"$javaExecutable\" : '\([^ ]*\)'`" =
"no" ]; then
+ # readlink(1) is not available as standard on Solaris 10.
+ readLink=`which readlink`
+ if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+ javaExecutable="`readlink -f \"$javaExecutable\"`"
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+ JAVA_HOME="$javaHome"
+ export JAVA_HOME
+ fi
+ fi
+fi
+
if [ -z "$JAVACMD" ] ; then
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
Modified: maven/maven-3/trunk/apache-maven/src/bin/mvnDebug
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/apache-maven/src/bin/mvnDebug?rev=1074273&r1=1074272&r2=1074273&view=diff
==============================================================================
--- maven/maven-3/trunk/apache-maven/src/bin/mvnDebug (original)
+++ maven/maven-3/trunk/apache-maven/src/bin/mvnDebug Thu Feb 24 19:47:42 2011
@@ -118,6 +118,21 @@ if $mingw ; then
# TODO classpath?
fi
+if [ -z "$JAVA_HOME" ]; then
+ javaExecutable="`which javac`"
+ if [ -n "$javaExecutable" -a ! "`expr \"$javaExecutable\" : '\([^ ]*\)'`" =
"no" ]; then
+ # readlink(1) is not available as standard on Solaris 10.
+ readLink=`which readlink`
+ if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+ javaExecutable="`readlink -f \"$javaExecutable\"`"
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+ JAVA_HOME="$javaHome"
+ export JAVA_HOME
+ fi
+ fi
+fi
+
if [ -z "$JAVACMD" ] ; then
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
Modified: maven/maven-3/trunk/apache-maven/src/bin/mvnyjp
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/apache-maven/src/bin/mvnyjp?rev=1074273&r1=1074272&r2=1074273&view=diff
==============================================================================
--- maven/maven-3/trunk/apache-maven/src/bin/mvnyjp (original)
+++ maven/maven-3/trunk/apache-maven/src/bin/mvnyjp Thu Feb 24 19:47:42 2011
@@ -126,6 +126,21 @@ if $mingw ; then
# TODO classpath?
fi
+if [ -z "$JAVA_HOME" ]; then
+ javaExecutable="`which javac`"
+ if [ -n "$javaExecutable" -a ! "`expr \"$javaExecutable\" : '\([^ ]*\)'`" =
"no" ]; then
+ # readlink(1) is not available as standard on Solaris 10.
+ readLink=`which readlink`
+ if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+ javaExecutable="`readlink -f \"$javaExecutable\"`"
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+ JAVA_HOME="$javaHome"
+ export JAVA_HOME
+ fi
+ fi
+fi
+
if [ -z "$JAVACMD" ] ; then
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
