Merge branch 'issue-214' into devel

Author: fvarrui

src/main/resources/linux/startup.sh.vtl

@@ -2,7 +2,7 @@
 #!/usr/bin/env bash
 # GNU/Linux startup script generated by JavaPackager plugin
 
-SCRIPTPATH=$(dirname $(readlink -e "$0"))
+SCRIPTPATH=$(dirname "$(readlink -e "$0")")
 
 #if ($info.bundleJre)
 JAVA="$SCRIPTPATH/${info.jreDirectoryName}/bin/java"
@@ -65,7 +65,7 @@ export PATH=${info.envPath}
 
 JVMDefaultOptions="${vmArgs}"
 JVMOptionsFile="$SCRIPTPATH/${info.name}.l4j.ini"
-[ -f $JVMOptionsFile ] && while read -r option; do JVMDefaultOptions+=" $option"; done <<< $(sed "/^#.*$/d" $JVMOptionsFile)
+[ -f "${JVMOptionsFile}" ] && while read -r option; do JVMDefaultOptions+=" $option"; done <<< $(sed "/^#.*$/d" "${JVMOptionsFile}")
 
 JVMClassPath="$BINARY"
 #foreach ($classpath in $info.classpaths)
@@ -78,12 +78,12 @@ cd "$SCRIPTPATH"
 
 #if ($info.scripts.bootstrap)
 # invoke bootstrap script
-Bootstrap=$SCRIPTPATH/scripts/${info.bootstrapFile.name} && [ -x "$Bootstrap" ] && $Bootstrap
+Bootstrap="$SCRIPTPATH/scripts/${info.bootstrapFile.name}" && [ -x "$Bootstrap" ] && "$Bootstrap"
 #end
 
 #if ($info.administratorRequired)
-pkexec env DISPLAY=$DISPLAY XAUTHORITY=$XAUTHORITY GDKBACKEND=x11 $JAVA $JVMDefaultOptions -cp $JVMClassPath ${info.mainClass} $@
+pkexec env DISPLAY=$DISPLAY XAUTHORITY=$XAUTHORITY GDKBACKEND=x11 "${JAVA}" ${JVMDefaultOptions} -cp "${JVMClassPath}" ${info.mainClass} $@
 #else
-$JAVA $JVMDefaultOptions -cp $JVMClassPath ${info.mainClass} $@
+"${JAVA}" ${JVMDefaultOptions} -cp "${JVMClassPath}" ${info.mainClass} $@
 #end
 exit 0