From 3d902715291dec6655a738bf5da18dec5024e838 Mon Sep 17 00:00:00 2001 From: Maxim Sobolev Date: Mon, 26 Nov 2001 13:00:50 +0000 Subject: [PATCH] Use "$@" instead of "$*" to pass parameters to a subshell. This ensures that parameters with spaces are passed correctly. PR: 32191 Submitted by: Ben Suffolk --- java/javavmwrapper/Makefile | 2 +- java/javavmwrapper/src/javavmwrapper.sh | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/java/javavmwrapper/Makefile b/java/javavmwrapper/Makefile index 19e023ed0476..2df0c9dc8af3 100644 --- a/java/javavmwrapper/Makefile +++ b/java/javavmwrapper/Makefile @@ -8,7 +8,7 @@ # PORTNAME= javavmwrapper -PORTVERSION= 1.1 +PORTVERSION= 1.2 CATEGORIES= java MASTER_SITES= # none DISTFILES= # none diff --git a/java/javavmwrapper/src/javavmwrapper.sh b/java/javavmwrapper/src/javavmwrapper.sh index 16e9a235b9f5..b82d3699afdf 100644 --- a/java/javavmwrapper/src/javavmwrapper.sh +++ b/java/javavmwrapper/src/javavmwrapper.sh @@ -19,7 +19,6 @@ # # MAINTAINER= sobomax@FreeBSD.org -ARGS="${*}" PREFIX="%%PREFIX%%" CONF="${PREFIX}/etc/javavms" IAM=`basename "${0}"` @@ -102,7 +101,7 @@ unset JAVA_HOME # First check if JAVAVM environment variable is set if [ x"${JAVAVM}" != x"" ]; then - tryrunVM "${JAVAVM}" "${ARGS}" + tryrunVM "${JAVAVM}" "${@}" fi # Then try to make sure that ${CONF} exists @@ -116,7 +115,7 @@ VMS=`/usr/bin/sed 's|#.*||' < "${CONF}" | uniq` # Finally try to run one of the ${VMS} for JAVAVM in ${VMS}; do - tryrunVM "${JAVAVM}" "${ARGS}"; + tryrunVM "${JAVAVM}" "${@}"; done echo "${IAM}: error: no suitable JavaVMs found" >&2