aboutsummaryrefslogtreecommitdiff
path: root/java/javavmwrapper
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2010-05-13 23:50:29 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2010-05-13 23:50:29 +0000
commit72445c6ce6f83a8aa6e0f74178359b110059a183 (patch)
tree3fff0fc3a02bc6925a3e21d9bb41f63e97fb74c1 /java/javavmwrapper
parenta9120149d772631ed2064087becc7092c76dd892 (diff)
downloadports-72445c6ce6f83a8aa6e0f74178359b110059a183.tar.gz
ports-72445c6ce6f83a8aa6e0f74178359b110059a183.zip
Notes
Diffstat (limited to 'java/javavmwrapper')
-rw-r--r--java/javavmwrapper/Makefile2
-rw-r--r--java/javavmwrapper/src/javavmwrapper.sh20
2 files changed, 11 insertions, 11 deletions
diff --git a/java/javavmwrapper/Makefile b/java/javavmwrapper/Makefile
index dbc6c622ab1a..79c84b2f71de 100644
--- a/java/javavmwrapper/Makefile
+++ b/java/javavmwrapper/Makefile
@@ -8,7 +8,7 @@
#
PORTNAME= javavmwrapper
-PORTVERSION= 2.3.4
+PORTVERSION= 2.3.5
CATEGORIES= java
MASTER_SITES= # none
DISTFILES= # none
diff --git a/java/javavmwrapper/src/javavmwrapper.sh b/java/javavmwrapper/src/javavmwrapper.sh
index 1d3fe4e0064b..38010e8e6f15 100644
--- a/java/javavmwrapper/src/javavmwrapper.sh
+++ b/java/javavmwrapper/src/javavmwrapper.sh
@@ -479,16 +479,16 @@ manualpageVM () {
#
setJavaHome() {
# Use JAVA_HOME if it's set, unless its set to %%PREFIX%%
- if [ -n "${JAVA_HOME}" -a \
- "`realpath "${JAVA_HOME}"`" != "`realpath "${_JAVAVM_PREFIX}"`" ]; then
- if [ -n "${JAVA_HOME}" -a -f "${JAVA_HOME}/bin/${_JAVAVM_PROG}" ]; then
- _JAVAVM_PROG_PATH="${JAVA_HOME}/bin"
- return 0
- elif [ -n "${JAVA_HOME}" -a \
- -f "${JAVA_HOME}/jre/bin/${_JAVAVM_PROG}" ]; then
- _JAVAVM_PROG_PATH="${JAVA_HOME}/jre/bin"
- return 0
- fi
+ if [ -n "${JAVA_HOME}" ]; then
+ if [ "`realpath "${JAVA_HOME}"`" != "`realpath "${_JAVAVM_PREFIX}"`" ]; then
+ if [ -f "${JAVA_HOME}/bin/${_JAVAVM_PROG}" ]; then
+ _JAVAVM_PROG_PATH="${JAVA_HOME}/bin"
+ return 0
+ elif [ -f "${JAVA_HOME}/jre/bin/${_JAVAVM_PROG}" ]; then
+ _JAVAVM_PROG_PATH="${JAVA_HOME}/jre/bin"
+ return 0
+ fi
+ fi
fi
unset JAVA_HOME