fix JavaFX path

3 files changed, 14 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4edf595c6265..d34b3b68b995 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,15 @@
 pkgbase = hmcl-new
 	pkgdesc = An unofficial build of HMCL that trying to compile and run HMCL with the latest LTS version of java. (with HMCL-Clean changes)
 	pkgver = 3.5.4.234
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/huanghongxun/HMCL
 	arch = any
 	license = GPL3
 	makedepends = java-environment>=17
 	makedepends = gradle
+	depends = java-runtime>=17
 	depends = java-openjfx>=17
+	depends = hicolor-icon-theme
 	provides = hmcl
 	conflicts = hmcl
 	source = hmcl.desktop
@@ -17,7 +19,7 @@ pkgbase = hmcl-new
 	source = 0001-Target-java-17.patch
 	source = 0002-Cleanup.patch
 	sha256sums = b4e8aa0f349bb3f5dd15a31c5a13ac3e10e5a5bcd2f97cf390041924275e43ef
-	sha256sums = 858b5082bc58ddc44fe74625937876e78442fdf5ff948d1e91cddbf170af9eeb
+	sha256sums = 4fcd4bf8f8d2ca39cf25a8d59daeb53ffa54fbca0356bd55aa17a5ee31d59a95
 	sha256sums = 2989a1b5301b8c7b9afdae5696c6a4e5246afa2d4f1f3d3dad5c192f036a9b4c
 	sha256sums = 69680efbdb9dc18ab8d6973ee4be442671133641a61602608084fb7fe67c3082
 	sha256sums = 7b9511c0f0eceef29577e879a00e0ab341fddeed6e9e33f54cefbaca11ae9354
diff --git a/PKGBUILD b/PKGBUILD
index 83a04d3d2d44..30f615cea940 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,12 +8,12 @@ _pkgname=HMCL
 _ver=3.5.4
 _build=234
 pkgver=$_ver.$_build
-pkgrel=1
+pkgrel=2
 pkgdesc='An unofficial build of HMCL that trying to compile and run HMCL with the latest LTS version of java. (with HMCL-Clean changes)'
 arch=('any')
 url='https://github.com/huanghongxun/HMCL'
 license=('GPL3')
-depends=('java-openjfx>=17')
+depends=('java-runtime>=17' 'java-openjfx>=17' 'hicolor-icon-theme')
 makedepends=('java-environment>=17' 'gradle')
 provides=('hmcl')
 conflicts=('hmcl')
@@ -25,7 +25,7 @@ source=('hmcl.desktop'
   "0002-Cleanup.patch"
 )
 sha256sums=('b4e8aa0f349bb3f5dd15a31c5a13ac3e10e5a5bcd2f97cf390041924275e43ef'
-  '858b5082bc58ddc44fe74625937876e78442fdf5ff948d1e91cddbf170af9eeb'
+  '4fcd4bf8f8d2ca39cf25a8d59daeb53ffa54fbca0356bd55aa17a5ee31d59a95'
   '2989a1b5301b8c7b9afdae5696c6a4e5246afa2d4f1f3d3dad5c192f036a9b4c'
   '69680efbdb9dc18ab8d6973ee4be442671133641a61602608084fb7fe67c3082'
   '7b9511c0f0eceef29577e879a00e0ab341fddeed6e9e33f54cefbaca11ae9354'
diff --git a/hmcl-launch-script b/hmcl-launch-script
index 4a923a4e8dd7..66eba1ea54d6 100755
--- a/hmcl-launch-script
+++ b/hmcl-launch-script
@@ -7,6 +7,11 @@ if [ "${1:-}" != -p ]; then
   cd "$WORKDIR"
 fi
 
-JAVA_HOME=/usr/lib/jvm/$(pacman -Ql java-openjfx | grep javafx | head -n 1 | cut -d / -f 5)
+JAVA_HOME=$(pacman -Ql java-runtime | grep -e '/usr/lib/jvm/.*/bin/java$' | head -n 1 | cut -s -d ' ' -f '2-' | cut -s -d / -f '-5')
+JAVAFX_HOME=$(dirname "$(pacman -Ql java-openjfx | grep -e '/javafx\..*\.jar$' | head -n 1 | cut -s -d ' ' -f '2-')")
 
-exec "${JAVA_HOME}"/bin/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-new/hmcl-new.jar "$@"
+exec "${JAVA_HOME}"/bin/java \
+  --module-path "${JAVAFX_HOME}/javafx.base.jar:${JAVAFX_HOME}/javafx.fxml.jar:${JAVAFX_HOME}/javafx.graphics.jar:${JAVAFX_HOME}/javafx.media.jar:${JAVAFX_HOME}/javafx.swing.jar:${JAVAFX_HOME}/javafx.web.jar:${JAVAFX_HOME}/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-new/hmcl-new.jar \
+  "$@"