Merge pull request #70 from tofi86/develop

Release version 3.0.4
tofi86 · Aug 24, 2018 · ebe2dba · ebe2dba
2 parents 49e55ed + a7ee3e4
commit ebe2dba
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 ChangeLog
 ---------
 
+### v3.0.4 (2018-08-24)
+* Bugfix: Variables `$APP_PACKAGE`, `$JAVAROOT`, `$USER_HOME` in `JVMOptions` key (Oracle) or `Java:Properties` key (Apple) were not expanded (#69)
+
 ### v3.0.3 (2018-07-29)
 * Bugfix: changes for the new Java 10 `java -version` formatting (#66)
 

diff --git a/src/universalJavaApplicationStub b/src/universalJavaApplicationStub
@@ -11,8 +11,8 @@
 #                                                                                #
 # @author    Tobias Fischer                                                      #
 # @url       https://github.com/tofi86/universalJavaApplicationStub              #
-# @date      2018-07-29                                                          #
-# @version   3.0.3                                                               #
+# @date      2018-08-24                                                          #
+# @version   3.0.4                                                               #
 #                                                                                #
 ##################################################################################
 #                                                                                #
@@ -767,7 +767,7 @@ exec "${JAVACMD}" \
 		-splash:"${ResourcesFolder}/${JVMSplashFile}" \
 		-Xdock:icon="${ResourcesFolder}/${CFBundleIconFile}" \
 		-Xdock:name="${CFBundleName}" \
-		${JVMOptions:+"${JVMOptions[@]}" }\
+		${JVMOptionsArr:+"${JVMOptionsArr[@]}" }\
 		${JVMDefaultOptions:+$JVMDefaultOptions }\
 		"${JVMMainClass}"\
 		${MainArgsArr:+ "${MainArgsArr[@]}"}\