Skip to content

Commit 15833ec

Browse files
committed
suppress -splash option if no splash image is specified in Info.plist // fixes tofi86#94
1 parent 7ca4b7f commit 15833ec

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/universalJavaApplicationStub

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# #
1212
# @author Tobias Fischer #
1313
# @url https://github.com/tofi86/universalJavaApplicationStub #
14-
# @date 2020-08-30 #
14+
# @date 2021-01-06 #
1515
# @version 3.1.0-beta #
1616
# #
1717
##################################################################################
@@ -810,10 +810,10 @@ stub_logger "[WorkingDirectory] ${WorkingDirectory}"
810810
# - main class
811811
# - main class arguments
812812
# - passthrough arguments from Terminal or Drag'n'Drop to Finder icon
813-
stub_logger "[Exec] \"$JAVACMD\" -cp \"${JVMClassPath}\" -splash:\"${ResourcesFolder}/${JVMSplashFile}\" -Xdock:icon=\"${ResourcesFolder}/${CFBundleIconFile}\" -Xdock:name=\"${CFBundleName}\" ${JVMOptionsArr:+$(printf "'%s' " "${JVMOptionsArr[@]}") }${JVMDefaultOptions:+$JVMDefaultOptions }${JVMMainClass}${MainArgsArr:+ $(printf "'%s' " "${MainArgsArr[@]}")}${ArgsPassthru:+ $(printf "'%s' " "${ArgsPassthru[@]}")}"
813+
stub_logger "[Exec] \"$JAVACMD\" -cp \"${JVMClassPath}\" ${JVMSplashFile:+ -splash:\"${ResourcesFolder}/${JVMSplashFile}\"} -Xdock:icon=\"${ResourcesFolder}/${CFBundleIconFile}\" -Xdock:name=\"${CFBundleName}\" ${JVMOptionsArr:+$(printf "'%s' " "${JVMOptionsArr[@]}") }${JVMDefaultOptions:+$JVMDefaultOptions }${JVMMainClass}${MainArgsArr:+ $(printf "'%s' " "${MainArgsArr[@]}")}${ArgsPassthru:+ $(printf "'%s' " "${ArgsPassthru[@]}")}"
814814
exec "${JAVACMD}" \
815815
-cp "${JVMClassPath}" \
816-
-splash:"${ResourcesFolder}/${JVMSplashFile}" \
816+
${JVMSplashFile:+ -splash:"${ResourcesFolder}/${JVMSplashFile}"} \
817817
-Xdock:icon="${ResourcesFolder}/${CFBundleIconFile}" \
818818
-Xdock:name="${CFBundleName}" \
819819
${JVMOptionsArr:+"${JVMOptionsArr[@]}" }\

0 commit comments

Comments
 (0)