summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTTsdzb2024-04-27 10:12:08 +0800
committerTTsdzb2024-04-27 10:12:08 +0800
commit5bd528de6ac7568758d44f3c14b5e4fdd05fd2e0 (patch)
tree053728e723dacc6f286bad2cf8fcb341ffb6b7e7
parentb04dc484553686e31563c4ec059a51c556ff0acf (diff)
downloadaur-5bd528de6ac7568758d44f3c14b5e4fdd05fd2e0.tar.gz
style: prettify launch script
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD2
-rwxr-xr-xhmcl-launch-script16
3 files changed, 8 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 221008bae8d9..9eddf75382cf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -17,7 +17,7 @@ pkgbase = hmcl-bin
source = LICENSE::https://raw.githubusercontent.com/HMCL-dev/HMCL/javafx/LICENSE
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 = 00df651be1c7b5a59f7374f85f4539e2e4adfc28bdb99b5382c2fbceed32d54d
+ sha256sums = ebbb213b2e21321af6b1825740b2b8f66e70a922a4427e90fa21a2c998b39b34
sha256sums = 2989a1b5301b8c7b9afdae5696c6a4e5246afa2d4f1f3d3dad5c192f036a9b4c
sha256sums = 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986
sha256sums = 46eb9e7dc92c052a70ba1c738a09e551009b45aba62a9fbfbd4ef0697708b981
diff --git a/PKGBUILD b/PKGBUILD
index 610faa3c5ca6..6c5ab3ec0823 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,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'
- '00df651be1c7b5a59f7374f85f4539e2e4adfc28bdb99b5382c2fbceed32d54d'
+ 'ebbb213b2e21321af6b1825740b2b8f66e70a922a4427e90fa21a2c998b39b34'
'2989a1b5301b8c7b9afdae5696c6a4e5246afa2d4f1f3d3dad5c192f036a9b4c'
'3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986'
'46eb9e7dc92c052a70ba1c738a09e551009b45aba62a9fbfbd4ef0697708b981')
diff --git a/hmcl-launch-script b/hmcl-launch-script
index ccd39402b84b..c73bcd224955 100755
--- a/hmcl-launch-script
+++ b/hmcl-launch-script
@@ -1,20 +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
-
-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 "$@"
-
+ 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