You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ah...@apache.org on 2012/12/01 15:50:03 UTC
[25/50] git commit: - export JAVA_HOME if it is not set or it
commands, like javadoc, that expect it don't work very well
- 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
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/5b1c1c57
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/5b1c1c57
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/5b1c1c57
Branch: refs/heads/feature/colorized-console/log4j2
Commit: 5b1c1c578b1adedb9289d14ea96b308d51d68092
Parents: 937a09c
Author: Jason van Zyl <jv...@apache.org>
Authored: Sun Nov 25 17:50:48 2012 +0000
Committer: Arnaud HeĢritier <ah...@exoplatform.com>
Committed: Sat Dec 1 13:51:03 2012 +0100
----------------------------------------------------------------------
apache-maven/src/bin/mvn | 10 +++++-----
apache-maven/src/bin/mvnDebug | 10 +++++-----
apache-maven/src/bin/mvnyjp | 10 +++++-----
3 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/5b1c1c57/apache-maven/src/bin/mvn
----------------------------------------------------------------------
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index ecebe9f..d9a2d75 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -62,14 +62,14 @@ case "`uname`" in
#
# Apple JDKs
#
- JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
+ export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
fi
if [[ -z "$JAVA_HOME" && -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ]] ; then
- #
- # Oracle JDKs
- #
- JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
+ #
+ # Oracle JDKs
+ #
+ export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
fi
;;
esac
http://git-wip-us.apache.org/repos/asf/maven/blob/5b1c1c57/apache-maven/src/bin/mvnDebug
----------------------------------------------------------------------
diff --git a/apache-maven/src/bin/mvnDebug b/apache-maven/src/bin/mvnDebug
index b7fffc7..14f76b1 100755
--- a/apache-maven/src/bin/mvnDebug
+++ b/apache-maven/src/bin/mvnDebug
@@ -66,14 +66,14 @@ case "`uname`" in
#
# Apple JDKs
#
- JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
+ export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
fi
if [[ -z "$JAVA_HOME" && -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ]] ; then
- #
- # Oracle JDKs
- #
- JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
+ #
+ # Oracle JDKs
+ #
+ export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
fi
;;
esac
http://git-wip-us.apache.org/repos/asf/maven/blob/5b1c1c57/apache-maven/src/bin/mvnyjp
----------------------------------------------------------------------
diff --git a/apache-maven/src/bin/mvnyjp b/apache-maven/src/bin/mvnyjp
index 99154db..d42bc87 100755
--- a/apache-maven/src/bin/mvnyjp
+++ b/apache-maven/src/bin/mvnyjp
@@ -70,14 +70,14 @@ case "`uname`" in
#
# Apple JDKs
#
- JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
+ export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
fi
if [[ -z "$JAVA_HOME" && -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ]] ; then
- #
- # Oracle JDKs
- #
- JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
+ #
+ # Oracle JDKs
+ #
+ export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
fi
if [ -z "$YJP_HOME" ]; then