diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2005-11-02 21:03:56 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2005-11-02 21:03:56 +0000 |
| commit | dbc431427c72729a0698f49756f5e36232c47ba5 (patch) | |
| tree | 7621b1299441a26d560ae46e0719358cfb696928 | |
| parent | Add calcurse, an ncurses based personal organizer (diff) | |
. Avoid an infinite loop by ignoring JAVA_HOME if its set to the location
of the wrapper script. I'm using a different patch than Herve submitted,
but the idea is the same.
. Bump PORTREVISION.
Submitted by: hq
Notes
Notes:
svn path=/head/; revision=147050
| -rw-r--r-- | java/javavmwrapper/Makefile | 2 | ||||
| -rw-r--r-- | java/javavmwrapper/src/javavmwrapper.sh | 17 |
2 files changed, 11 insertions, 8 deletions
diff --git a/java/javavmwrapper/Makefile b/java/javavmwrapper/Makefile index 86504088e945..a8f274e76416 100644 --- a/java/javavmwrapper/Makefile +++ b/java/javavmwrapper/Makefile @@ -9,7 +9,7 @@ PORTNAME= javavmwrapper PORTVERSION= 2.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= java MASTER_SITES= # none DISTFILES= # none diff --git a/java/javavmwrapper/src/javavmwrapper.sh b/java/javavmwrapper/src/javavmwrapper.sh index 81497379248e..7cf77c6dbcd8 100644 --- a/java/javavmwrapper/src/javavmwrapper.sh +++ b/java/javavmwrapper/src/javavmwrapper.sh @@ -414,13 +414,16 @@ if [ "${IAM}" = "javavm" ]; then IAM=java fi -# Use JAVA_HOME if its set in the environment -if [ ! -z "${JAVA_HOME}" -a -x "${JAVA_HOME}/bin/${IAM}" ]; then - export JAVA_HOME - tryJavaCommand "${JAVA_HOME}/bin/${IAM}" "${@}" -elif [ ! -z "${JAVA_HOME}" -a -x "${JAVA_HOME}/jre/bin/${IAM}" ]; then - export JAVA_HOME - tryJavaCommand "${JAVA_HOME}/jre/bin/${IAM}" "${@}" +# Ignore JAVA_HOME if it's set to %%PREFIX%% +if [ "`realpath "${JAVA_HOME}"`" != "`realpath "${PREFIX}"`" ]; then + # Otherwise use JAVA_HOME if it's set + if [ ! -z "${JAVA_HOME}" -a -x "${JAVA_HOME}/bin/${IAM}" ]; then + export JAVA_HOME + tryJavaCommand "${JAVA_HOME}/bin/${IAM}" "${@}" + elif [ ! -z "${JAVA_HOME}" -a -x "${JAVA_HOME}/jre/bin/${IAM}" ]; then + export JAVA_HOME + tryJavaCommand "${JAVA_HOME}/jre/bin/${IAM}" "${@}" + fi fi unset JAVA_HOME |