diff options
| author | TTsdzb | 2024-04-27 10:08:07 +0800 |
|---|---|---|
| committer | TTsdzb | 2024-04-27 10:08:07 +0800 |
| commit | b04dc484553686e31563c4ec059a51c556ff0acf (patch) | |
| tree | 22474f1dc5fae32cff5c76cc5b6bfa4d02ec21d0 | |
| parent | 04667107510a884b82dcc4cd820cd284ca56d232 (diff) | |
| download | aur-b04dc484553686e31563c4ec059a51c556ff0acf.tar.gz | |
fix: default java conflict with some openjfx
Sometimes openjfx is provided by an individual java runtime, thus default java command might
conflict with openjfx.
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | PKGBUILD | 7 | ||||
| -rwxr-xr-x | hmcl-launch-script | 1 |
3 files changed, 9 insertions, 7 deletions
@@ -1,7 +1,7 @@ pkgbase = hmcl-bin pkgdesc = A Minecraft Launcher which is multi-functional, cross-platform and popular. pkgver = 3.5.7.246 - pkgrel = 1 + pkgrel = 2 url = https://github.com/huanghongxun/HMCL arch = any license = GPL3 @@ -10,14 +10,14 @@ pkgbase = hmcl-bin depends = java-openjfx provides = hmcl conflicts = hmcl - noextract = hmcl-bin-3.5.7.246-1.jar + noextract = hmcl-bin-3.5.7.246-2.jar source = hmcl.desktop source = hmcl-launch-script source = craft_table.png source = LICENSE::https://raw.githubusercontent.com/HMCL-dev/HMCL/javafx/LICENSE - source = hmcl-bin-3.5.7.246-1.jar::https://github.com/HMCL-dev/HMCL/releases/download/v3.5.7.246/HMCL-3.5.7.246.jar + source = hmcl-bin-3.5.7.246-2.jar::https://github.com/HMCL-dev/HMCL/releases/download/v3.5.7.246/HMCL-3.5.7.246.jar sha256sums = 9a561081f8f3ece3da114afd4f6d90565ca0e04716eef4ea88c6b4306566ae9b - sha256sums = fbea374c820af533b59efa9bbb3918e7d915582e001ab43b00eb1c54e1bb434c + sha256sums = 00df651be1c7b5a59f7374f85f4539e2e4adfc28bdb99b5382c2fbceed32d54d sha256sums = 2989a1b5301b8c7b9afdae5696c6a4e5246afa2d4f1f3d3dad5c192f036a9b4c sha256sums = 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 sha256sums = 46eb9e7dc92c052a70ba1c738a09e551009b45aba62a9fbfbd4ef0697708b981 @@ -1,11 +1,12 @@ # Contributor: Rowisi < nomail <at> private <dot> com > # Contributor: So1ar <so1ar114514@gmail.com> -# Manitor: Bot-wxt1221 <3264117476@qq.com> +# Contributor: Bot-wxt1221 <3264117476@qq.com> +# Manitor: TTsdzb <ttsdzb at outlook dot com> pkgname=hmcl-bin _ver=3.5.7.246 pkgver=${_ver} -pkgrel=1 +pkgrel=2 pkgdesc="A Minecraft Launcher which is multi-functional, cross-platform and popular." arch=('any') url="https://github.com/huanghongxun/HMCL" @@ -19,7 +20,7 @@ source=("hmcl.desktop" "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=('9a561081f8f3ece3da114afd4f6d90565ca0e04716eef4ea88c6b4306566ae9b' - 'fbea374c820af533b59efa9bbb3918e7d915582e001ab43b00eb1c54e1bb434c' + '00df651be1c7b5a59f7374f85f4539e2e4adfc28bdb99b5382c2fbceed32d54d' '2989a1b5301b8c7b9afdae5696c6a4e5246afa2d4f1f3d3dad5c192f036a9b4c' '3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986' '46eb9e7dc92c052a70ba1c738a09e551009b45aba62a9fbfbd4ef0697708b981') diff --git a/hmcl-launch-script b/hmcl-launch-script index 085803cff418..ccd39402b84b 100755 --- a/hmcl-launch-script +++ b/hmcl-launch-script @@ -10,6 +10,7 @@ JAVA_HOME=/usr/lib/jvm/$(pacman -Ql java-openjfx | grep javafx | head -n 1 | cut if [ -n "$(pacman -Ql java-openjfx | grep javafx | head -n 1 | cut -d / -f 5)" ]; then +export PATH="$JAVA_HOME/bin:$PATH" 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 "$@" else |