sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

. Avoid an infinite loop by ignoring JAVA_HOME if its set to the location

Browse source 
of the wrapper script.  I'm using a different patch than Herve submitted,
  but the idea is the same.
. Bump PORTREVISION.

Submitted by:	hq
This commit is contained in:
Greg Lewis 2005-11-02 21:03:56 +00:00
parent c0b47a8e05
commit dbc431427c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=147050
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
java/javavmwrapper/Makefile
View file

@ -9,7 +9,7 @@
PORTNAME= javavmwrapper PORTNAME= javavmwrapper
PORTVERSION= 2.0 PORTVERSION= 2.0
PORTREVISION= 5 PORTREVISION= 6
CATEGORIES= java CATEGORIES= java
MASTER_SITES= # none MASTER_SITES= # none
DISTFILES= # none DISTFILES= # none

5
java/javavmwrapper/src/javavmwrapper.sh
View file

@ -414,7 +414,9 @@ if [ "${IAM}" = "javavm" ]; then
IAM=java IAM=java
fi fi
# Use JAVA_HOME if its set in the environment # 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 if [ ! -z "${JAVA_HOME}" -a -x "${JAVA_HOME}/bin/${IAM}" ]; then
export JAVA_HOME export JAVA_HOME
tryJavaCommand "${JAVA_HOME}/bin/${IAM}" "${@}" tryJavaCommand "${JAVA_HOME}/bin/${IAM}" "${@}"
@ -422,6 +424,7 @@ elif [ ! -z "${JAVA_HOME}" -a -x "${JAVA_HOME}/jre/bin/${IAM}" ]; then
export JAVA_HOME export JAVA_HOME
tryJavaCommand "${JAVA_HOME}/jre/bin/${IAM}" "${@}" tryJavaCommand "${JAVA_HOME}/jre/bin/${IAM}" "${@}"
fi fi
fi
unset JAVA_HOME unset JAVA_HOME