Skip to content
This repository was archived by the owner on Feb 4, 2023. It is now read-only.

Commit e105140

Browse files
committed
quote variable checks (-z) for ${JAVACMD} to avoid failures when path contains spaces // fixes #48
1 parent 5c4d1d5 commit e105140

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

src/universalJavaApplicationStub

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# #
1414
# @author Tobias Fischer #
1515
# @url https://github.com/tofi86/universalJavaApplicationStub #
16-
# @date 2017-07-28 #
16+
# @date 2017-09-29 #
1717
# @version 2.1.0 #
1818
# #
1919
# #
@@ -413,7 +413,7 @@ elif [ ! -z ${JVMVersion} ] ; then
413413
if [ -x "${oracle_jre_plugin}" ] && JavaVersionSatisfiesRequirement ${oracle_jre_version} ${JVMVersion} ; then
414414
this_java_ver=$(comparableJavaVersionNumber $(extractJavaVersionString "${oracle_jre_plugin}"))
415415
# use this compatible version only if the above returned empty or if the version number is higher
416-
if [ -z ${JAVACMD} ] || [ ${this_java_ver} -ge ${JAVACMD_version} ] ; then
416+
if [ -z "${JAVACMD}" ] || [ ${this_java_ver} -ge ${JAVACMD_version} ] ; then
417417
JAVACMD="${oracle_jre_plugin}"
418418
JAVACMD_version=${this_java_ver}
419419
fi
@@ -423,13 +423,13 @@ elif [ ! -z ${JVMVersion} ] ; then
423423
if [ -x "${apple_jre_plugin}" ] && JavaVersionSatisfiesRequirement ${apple_jre_version} ${JVMVersion} ; then
424424
this_java_ver=$(comparableJavaVersionNumber $(extractJavaVersionString "${apple_jre_plugin}"))
425425
# use this compatible version only if the above returned empty or if the version number is higher
426-
if [ -z ${JAVACMD} ] || [ ${this_java_ver} -ge ${JAVACMD_version} ] ; then
426+
if [ -z "${JAVACMD}" ] || [ ${this_java_ver} -ge ${JAVACMD_version} ] ; then
427427
JAVACMD="${apple_jre_plugin}"
428428
JAVACMD_version=${this_java_ver}
429429
fi
430430
fi
431431

432-
if [ -z "$JAVACMD" ] ; then
432+
if [ -z "${JAVACMD}" ] ; then
433433
# display human readable java version (#28)
434434
java_version_hr=`echo ${JVMVersion} | sed -E 's/[0-9]\.([0-9+*]+)/ \1/g' | sed "s/+/ ${MSG_JAVA_VERSION_OR_LATER}/" | sed "s/*/ ${MSG_JAVA_VERSION_LATEST}/"`
435435
# display error message with applescript
@@ -453,7 +453,7 @@ else
453453
if [ -x "${oracle_jre_plugin}" ] ; then
454454
this_java_ver=$(comparableJavaVersionNumber $(extractJavaVersionString "${oracle_jre_plugin}"))
455455
# use this compatible version only if the above returned empty or if the version number is higher
456-
if [ -z ${JAVACMD} ] || [ ${this_java_ver} -ge ${JAVACMD_version} ] ; then
456+
if [ -z "${JAVACMD}" ] || [ ${this_java_ver} -ge ${JAVACMD_version} ] ; then
457457
JAVACMD="${oracle_jre_plugin}"
458458
JAVACMD_version=${this_java_ver}
459459
fi
@@ -463,7 +463,7 @@ else
463463
if [ -x "${apple_jre_plugin}" ] ; then
464464
this_java_ver=$(comparableJavaVersionNumber $(extractJavaVersionString "${apple_jre_plugin}"))
465465
# use this compatible version only if the above returned empty or if the version number is higher
466-
if [ -z ${JAVACMD} ] || [ ${this_java_ver} -ge ${JAVACMD_version} ] ; then
466+
if [ -z "${JAVACMD}" ] || [ ${this_java_ver} -ge ${JAVACMD_version} ] ; then
467467
JAVACMD="${apple_jre_plugin}"
468468
JAVACMD_version=${this_java_ver}
469469
fi
@@ -487,8 +487,8 @@ if [ -z ${JVMMainClass} ]; then
487487
exit 2
488488

489489

490-
# check whether $JAVACMD is a file and executable
491-
elif [ -f "$JAVACMD" ] && [ -x "$JAVACMD" ] ; then
490+
# check whether ${JAVACMD} is a file and executable
491+
elif [ -f "${JAVACMD}" ] && [ -x "${JAVACMD}" ] ; then
492492

493493
# enable drag&drop to the dock icon
494494
export CFProcessPath="$0"
@@ -511,7 +511,7 @@ elif [ -f "$JAVACMD" ] && [ -x "$JAVACMD" ] ; then
511511
# - JVM default options
512512
# - main class
513513
# - JVM arguments
514-
exec "$JAVACMD" \
514+
exec "${JAVACMD}" \
515515
-cp "${JVMClassPath}" \
516516
-splash:"${ResourcesFolder}/${JVMSplashFile}" \
517517
-Xdock:icon="${ResourcesFolder}/${CFBundleIconFile}" \

0 commit comments

Comments
 (0)