Allow jar wrapper to take quoted arguments

Make the jar wrapper script correctly handle quoted arguments with
spaces in them.  Also allow JVM arguments in the form -J-XX, not just
-JXX.

Test: m checkbuild
Change-Id: Iec5105bc390f2a12c6a4cda7f76d37585c39f520
This commit is contained in:
Colin Cross 2019-07-11 10:59:59 -07:00
parent 0cb0d7b1c5
commit e5cae33f5d

View file

@ -48,11 +48,11 @@ if [ ! -r "${jardir}/${jarfile}" ]; then
exit 1
fi
javaOpts=""
declare -a javaOpts=()
while expr "x$1" : 'x-J' >/dev/null; do
opt=`expr "$1" : '-J\(.*\)'`
javaOpts="${javaOpts} -${opt}"
opt=`expr "$1" : '-J-\{0,1\}\(.*\)'`
javaOpts+=("-${opt}")
shift
done
exec java ${javaOpts} -jar ${jardir}/${jarfile} "$@"
exec java "${javaOpts[@]}" -jar ${jardir}/${jarfile} "$@"