Relaese 1.0.3

- Fixed a bug that causes wrong conversions when the user types a leading plus sign - Minor Unicode fixes
BO-StudentProject-2020 · Feb 24, 2021 · 6592b34 · 6592b34
1 parent 4eef88d
commit 6592b34
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 24 deletions.
diff --git a/build_installer_mac.command b/build_installer_mac.command
@@ -43,18 +43,18 @@ do
 	echo "${NAME-$VERSION}.${TYPE} wird erstellt"
 	echo ""
 
-	/Library/Java/jdk-14.jdk/Contents/Home/bin/jpackage \
-	--type $TYPE \
+	jpackage \
+	--type "${TYPE}" \
 	--name "${NAME}" \
 	--description "${DESCRIPTION}" \
 	--vendor "${VENDOR}" \
-	--app-version $VERSION \
-	--input $INPUT/jpackage \
-	--dest $OUT \
+	--app-version "${VERSION}" \
+	--input "${INPUT}/jpackage" \
+	--dest "${OUT}" \
 	--main-jar "${MAIN_JAR}" \
 	--mac-package-name "${NAME}" \
 	--license-file "${LICENSE_FILE}" \
-	--icon ./Logo/$NAME.icns
+	--icon "./Logo/${NAME}.icns"
 
 	echo ""
 	mv "./${OUT}/${NAME}-${VERSION}.${TYPE}" "./${OUT}/${NAME}-${VERSION}-mac-install.${TYPE}"

diff --git a/build_mvn_and_installer_linux.sh b/build_mvn_and_installer_linux.sh
@@ -67,18 +67,18 @@ do
 	echo "${NAME-$VERSION}.${TYPE} wird erstellt"
 	echo ""
 
-	/library/java/jdk-14.0.1/bin/jpackage \
-	--type $TYPE \
+	jpackage \
+	--type "${TYPE}" \
 	--name "${NAME}" \
 	--description "${DESCRIPTION}" \
 	--vendor "${VENDOR}" \
-	--app-version $VERSION \
-	--input $INPUT/jpackage \
-	--dest $OUT \
+	--app-version "${VERSION}" \
+	--input "${INPUT}/jpackage" \
+	--dest "${OUT}" \
 	--main-jar "${MAIN_JAR}" \
 	--linux-shortcut \
 	--license-file "${LICENSE_FILE}" \
-	--icon ./Logo/$NAME.png \
+	--icon "./Logo/${NAME}.png" \
 	--linux-rpm-license-type "MIT License"
 
 	echo ""

diff --git a/build_mvn_and_installer_linux_rpm.sh b/build_mvn_and_installer_linux_rpm.sh
@@ -67,18 +67,18 @@ do
 	echo "${NAME-$VERSION}.${TYPE} wird erstellt"
 	echo ""
 
-	/library/java/jdk-14.0.1/bin/jpackage \
-	--type $TYPE \
+	jpackage \
+	--type "${TYPE}" \
 	--name "${NAME}" \
 	--description "${DESCRIPTION}" \
 	--vendor "${VENDOR}" \
-	--app-version $VERSION \
-	--input $INPUT/jpackage \
-	--dest $OUT \
+	--app-version "${VERSION}" \
+	--input "${INPUT}/jpackage" \
+	--dest "${OUT}" \
 	--main-jar "${MAIN_JAR}" \
 	--linux-shortcut \
 	--license-file "${LICENSE_FILE}" \
-	--icon ./Logo/$NAME.png \
+	--icon "./Logo/${NAME}.png" \
 	--linux-rpm-license-type "MIT License"
 
 	echo ""

diff --git a/build_mvn_and_installer_mac.command b/build_mvn_and_installer_mac.command
@@ -66,18 +66,18 @@ do
 	echo "${NAME-$VERSION}.${TYPE} wird erstellt"
 	echo ""
 
-	/Library/Java/jdk-14.jdk/Contents/Home/bin/jpackage \
-	--type $TYPE \
+	jpackage \
+	--type "${TYPE}" \
 	--name "${NAME}" \
 	--description "${DESCRIPTION}" \
 	--vendor "${VENDOR}" \
-	--app-version $VERSION \
-	--input $INPUT/jpackage \
-	--dest $OUT \
+	--app-version "${VERSION}" \
+	--input "${INPUT}/jpackage" \
+	--dest "${OUT}" \
 	--main-jar "${MAIN_JAR}" \
 	--mac-package-name "${NAME}" \
 	--license-file "${LICENSE_FILE}" \
-	--icon ./Logo/$NAME.icns
+	--icon "./Logo/${NAME}.icns"
 
 	echo ""
 	mv "./${OUT}/${NAME}-${VERSION}.${TYPE}" "./${OUT}/${NAME}-${VERSION}-mac-install.${TYPE}"