update to 3.5.5.235

3 files changed, 14 insertions, 25 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 8fc7647eea7a..5d607856a115 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,24 @@
 # Contributor: Rowisi < nomail <at> private <dot> com >
 # Maintainer: So1ar <so1ar114514@gmail.com>
 
-pkgname=hmcl-bin
-_ver=3.5.4
-_build=235
-pkgver=${_ver}.${_build}
+pkgname=hmcl-stable-bin
+_ver=3.5.5.235
+pkgver=${_ver}
 pkgrel=2
 pkgdesc="A Minecraft Launcher which is multi-functional, cross-platform and popular."
 arch=('any')
 url="https://github.com/huanghongxun/HMCL"
 license=('GPL3')
-depends=('java-openjfx' 'java-runtime' 'gtk2')
+depends=('java-runtime' 'gtk2')
 provides=('hmcl')
 conflicts=('hmcl')
 source=("hmcl.desktop"
         "hmcl-launch-script"
         "craft_table.png"
-        "LICENSE::https://raw.githubusercontent.com/huanghongxun/HMCL/javafx/LICENSE"
-        "${pkgname}-${pkgver}-${pkgrel}.jar::https://github.com/huanghongxun/HMCL/releases/download/v${pkgver}/HMCL-${pkgver}.jar")
-sha256sums=('9a561081f8f3ece3da114afd4f6d90565ca0e04716eef4ea88c6b4306566ae9b'
-            '0c1ee34a9aa72e9f573730bff336e26095cb5e09d27d26d20ce3e0a7c5714ee7'
+        "LICENSE::https://raw.githubusercontent.com/HMCL-dev/HMCL/javafx/LICENSE"
+        "${pkgname}-${pkgver}-${pkgrel}.jar::https://github.com/HMCL-dev/HMCL/releases/download/v${pkgver}/HMCL-${pkgver}.jar")
+sha256sums=('a367a2d222dc86b3e3a60af0727192aa461922735825bf2ccab72a1d95c60325'
+            'ae7e1f29c5d74cc1e9d841e55c62068a74d4c933bca8e57bd00528816f97b3aa'
             '2989a1b5301b8c7b9afdae5696c6a4e5246afa2d4f1f3d3dad5c192f036a9b4c'
             '3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986'
             '86946bbb52194786f37b3ea25a50baaa8edefed0ab78cdef22b213ded16a1702')
@@ -29,7 +28,7 @@ noextract=("${pkgname}-${pkgver}-${pkgrel}.jar")
 package() {
   install -Dm755 "hmcl-launch-script" "${pkgdir}/usr/bin/${pkgname}"
   install -Dm644 "hmcl.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-  install -Dm644 "${pkgname}-${pkgver}-${pkgrel}.jar" "${pkgdir}/usr/share/java/${pkgname}/${pkgname}.jar"
+  install -Dm644 "${pkgname}-${pkgver}-${pkgrel}.jar" "${pkgdir}/usr/share/java/hmcl-bin/hmcl-bin.jar"
   install -Dm644 "craft_table.png" "${pkgdir}/usr/share/icons/hicolor/48x48/apps/${pkgname}.png"
   install -Dm644 "LICENSE" "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
diff --git a/hmcl-launch-script b/hmcl-launch-script
index 9330ba6e4feb..d18a3efe9519 100755
--- a/hmcl-launch-script
+++ b/hmcl-launch-script
@@ -1,21 +1,11 @@
 #!/bin/sh
 
-set -e
-
-if [ "$1" != "-p" ]; then
+if [[ "$1" != "-p" ]]; then
     WORKDIR=${XDG_CONFIG_HOME:-$HOME/.config}/hmcl
     mkdir -p $WORKDIR
     cd $WORKDIR
 fi
 
-if [ -n "${JAVA_HOME}" ]; then
-    JAVA=${JAVA_HOME}/bin/java
-else
-    JAVA=java
-fi
-
-if [ -z "${JAVAFX_HOME}" ]; then
-    JAVAFX_HOME=/usr/lib/jvm/$(pacman -Ql java-openjfx | grep javafx | head -n 1 | cut -d / -f 5)
-fi
+JAVA_HOME=/usr/lib/jvm/$(pacman -Ql java-openjfx | grep javafx | head -n 1 | cut -d / -f 5)
 
-exec "${JAVA}" --module-path "${JAVAFX_HOME}/lib/javafx.base.jar:${JAVAFX_HOME}/lib/javafx.fxml.jar:${JAVAFX_HOME}/lib/javafx.graphics.jar:${JAVAFX_HOME}/lib/javafx.media.jar:${JAVAFX_HOME}/lib/javafx.swing.jar:${JAVAFX_HOME}/lib/javafx.web.jar:${JAVAFX_HOME}/lib/javafx.controls.jar" --add-modules=javafx.base --add-modules=javafx.fxml --add-modules=javafx.graphics --add-modules=javafx.media --add-modules=javafx.swing --add-modules=javafx.web --add-modules=javafx.controls -jar /usr/share/java/hmcl-bin/hmcl-bin.jar "$@"
+exec java --module-path "${JAVA_HOME}/lib/javafx.base.jar:${JAVA_HOME}/lib/javafx.fxml.jar:${JAVA_HOME}/lib/javafx.graphics.jar:${JAVA_HOME}/lib/javafx.media.jar:${JAVA_HOME}/lib/javafx.swing.jar:${JAVA_HOME}/lib/javafx.web.jar:${JAVA_HOME}/lib/javafx.controls.jar" --add-modules=javafx.base --add-modules=javafx.fxml --add-modules=javafx.graphics --add-modules=javafx.media --add-modules=javafx.swing --add-modules=javafx.web --add-modules=javafx.controls -jar /usr/share/java/hmcl-bin/hmcl-bin.jar "$@"
diff --git a/hmcl.desktop b/hmcl.desktop
index aad0b236f0fe..8bd68b5408b1 100644
--- a/hmcl.desktop
+++ b/hmcl.desktop
@@ -3,8 +3,8 @@ Version=1.0
 Type=Application
 Name=HMCL
 Comment=Hello Minecraft! Launcher, a powerful Minecraft launcher.
-Exec=hmcl-bin
-Icon=hmcl-bin
+Exec=hmcl-stable-bin
+Icon=hmcl-stable-bin
 Terminal=false
 StartupNotify=false
 Categories=Game;