- export JAVA_HOME if it is not set or it commands, like javadoc, that expect it don't work very well

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413378 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason van Zyl 2012-11-25 17:50:48 +00:00
parent 9009b8f858
commit becf420bfa
3 changed files with 15 additions and 15 deletions

View File

@ -62,14 +62,14 @@ case "`uname`" in
# #
# Apple JDKs # Apple JDKs
# #
JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
fi fi
if [[ -z "$JAVA_HOME" && -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ]] ; then if [[ -z "$JAVA_HOME" && -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ]] ; then
# #
# Oracle JDKs # Oracle JDKs
# #
JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
fi fi
;; ;;
esac esac

View File

@ -66,14 +66,14 @@ case "`uname`" in
# #
# Apple JDKs # Apple JDKs
# #
JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
fi fi
if [[ -z "$JAVA_HOME" && -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ]] ; then if [[ -z "$JAVA_HOME" && -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ]] ; then
# #
# Oracle JDKs # Oracle JDKs
# #
JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
fi fi
;; ;;
esac esac

View File

@ -70,14 +70,14 @@ case "`uname`" in
# #
# Apple JDKs # Apple JDKs
# #
JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
fi fi
if [[ -z "$JAVA_HOME" && -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ]] ; then if [[ -z "$JAVA_HOME" && -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ]] ; then
# #
# Oracle JDKs # Oracle JDKs
# #
JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
fi fi
if [ -z "$YJP_HOME" ]; then if [ -z "$YJP_HOME" ]; then