summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD11
-rwxr-xr-xhmcl-launch-script15
3 files changed, 18 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a90260b08a91..9eddf75382cf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = hmcl-bin
pkgdesc = A Minecraft Launcher which is multi-functional, cross-platform and popular.
- pkgver = 3.5.6.240
- pkgrel = 1
+ pkgver = 3.5.7.246
+ pkgrel = 2
url = https://github.com/huanghongxun/HMCL
arch = any
license = GPL3
@@ -10,16 +10,16 @@ pkgbase = hmcl-bin
depends = java-openjfx
provides = hmcl
conflicts = hmcl
- noextract = hmcl-bin-3.5.6.240-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.6.240-1.jar::https://github.com/HMCL-dev/HMCL/releases/download/v3.5.6.240/HMCL-3.5.6.240.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 = 26ed30d5c96f645da00780f71f36e43b1b790d81307b8ee8f98e0d065970433d
+ sha256sums = ebbb213b2e21321af6b1825740b2b8f66e70a922a4427e90fa21a2c998b39b34
sha256sums = 2989a1b5301b8c7b9afdae5696c6a4e5246afa2d4f1f3d3dad5c192f036a9b4c
sha256sums = 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986
- sha256sums = b67dfecc4f4adf551f707c10ab305ba818ac60e767bf050ece9727a8a4934fb0
+ sha256sums = 46eb9e7dc92c052a70ba1c738a09e551009b45aba62a9fbfbd4ef0697708b981
pkgname = hmcl-bin
diff --git a/PKGBUILD b/PKGBUILD
index 88d59925c626..48c16aad46bc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -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>
+# Maintainer: TTsdzb <ttsdzb at outlook dot com>
pkgname=hmcl-bin
-_ver=3.5.6.240
+_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,10 +20,10 @@ 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'
- '26ed30d5c96f645da00780f71f36e43b1b790d81307b8ee8f98e0d065970433d'
+ 'ebbb213b2e21321af6b1825740b2b8f66e70a922a4427e90fa21a2c998b39b34'
'2989a1b5301b8c7b9afdae5696c6a4e5246afa2d4f1f3d3dad5c192f036a9b4c'
'3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986'
- 'b67dfecc4f4adf551f707c10ab305ba818ac60e767bf050ece9727a8a4934fb0')
+ '46eb9e7dc92c052a70ba1c738a09e551009b45aba62a9fbfbd4ef0697708b981')
noextract=("${pkgname}-${pkgver}-${pkgrel}.jar")
diff --git a/hmcl-launch-script b/hmcl-launch-script
index 085803cff418..c73bcd224955 100755
--- a/hmcl-launch-script
+++ b/hmcl-launch-script
@@ -1,19 +1,16 @@
#!/bin/sh
if [[ "$1" != "-p" ]]; then
- WORKDIR=${XDG_CONFIG_HOME:-$HOME/.config}/hmcl
- mkdir -p $WORKDIR
- cd $WORKDIR
+ WORKDIR=${XDG_CONFIG_HOME:-$HOME/.config}/hmcl
+ mkdir -p $WORKDIR
+ cd $WORKDIR
fi
JAVA_HOME=/usr/lib/jvm/$(pacman -Ql java-openjfx | grep javafx | head -n 1 | cut -d / -f 5)
if [ -n "$(pacman -Ql java-openjfx | grep javafx | head -n 1 | cut -d / -f 5)" ]; then
-
-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 "$@"
-
+ 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
-
-exec java -jar /usr/share/java/hmcl-bin/hmcl-bin.jar "$@"
-
+ exec java -jar /usr/share/java/hmcl-bin/hmcl-bin.jar "$@"
fi