summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorROllerozxa2021-10-24 20:39:06 +0200
committerROllerozxa2021-10-24 20:39:06 +0200
commit98dac0b62f30266ba2bee1eee9a63e83fd982682 (patch)
tree458c4d5801d229638662a58beb07a8dbf64e1a6d
parent9ff74880e92ea3f7be4dc747b1523ecf94f45709 (diff)
downloadaur-98dac0b62f30266ba2bee1eee9a63e83fd982682.tar.gz
Fix to allow for either OpenJDK 16 or 17.
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD5
-rw-r--r--mcaselector6
3 files changed, 9 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 417e1026419c..4d1089ef4ef0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = mcaselector
pkgdesc = An external tool to export or delete selected chunks and regions from a world save of Minecraft Java Edition.
pkgver = 1.16.3
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/Querz/mcaselector
arch = any
license = MIT
@@ -17,6 +17,6 @@ pkgbase = mcaselector
sha256sums = 0a9850acdd947f9d482015c9e47eb2df400e95290e6d93260d5adf996e2c2d47
sha256sums = 9f97cb7dbdfe2a5871223e7b529d0a621ac342120b53120eaf9d55c5ef9b5b4d
sha256sums = c8aa867604c6eb3e31649cfec02d914aa0ab6cd30080cb7a4aecbecef2254837
- sha256sums = 638f77d331168fa64d7900f5781d27674d80baf651627dec8c273c3c39c8f968
+ sha256sums = 8f1abeace239e4d4e2e331b45cf01cd3f358e03955ad543405ebc95b022d7e90
pkgname = mcaselector
diff --git a/PKGBUILD b/PKGBUILD
index 24b53cdbb6a4..52947efd02a4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,9 @@
# Maintainer: ROllerozxa <temporaryemail4meh [gee mail]>
# Contributor: sem.z <sem.z@protonmail.com>
+# Contributor: soulsuke <6tsukiyami9@gmail.com>
pkgname=mcaselector
pkgver=1.16.3
-pkgrel=1
+pkgrel=2
pkgdesc="An external tool to export or delete selected chunks and regions from a world save of Minecraft Java Edition."
arch=(any)
url="https://github.com/Querz/mcaselector"
@@ -15,7 +16,7 @@ source=("mcaselector-${pkgver}.jar::https://github.com/Querz/mcaselector/release
sha256sums=('0a9850acdd947f9d482015c9e47eb2df400e95290e6d93260d5adf996e2c2d47'
'9f97cb7dbdfe2a5871223e7b529d0a621ac342120b53120eaf9d55c5ef9b5b4d'
'c8aa867604c6eb3e31649cfec02d914aa0ab6cd30080cb7a4aecbecef2254837'
- '638f77d331168fa64d7900f5781d27674d80baf651627dec8c273c3c39c8f968')
+ '8f1abeace239e4d4e2e331b45cf01cd3f358e03955ad543405ebc95b022d7e90')
noextract=("mcaselector-${pkgver}.jar")
options=(!strip)
diff --git a/mcaselector b/mcaselector
index c125a5911cd9..fab98509466b 100644
--- a/mcaselector
+++ b/mcaselector
@@ -1,5 +1,7 @@
#!/bin/sh
-export PATH="/usr/lib/jvm/java-16-openjdk/bin/:$PATH"
+JV="$(javac -version | sed -e "s,.* ,,")"
-java --module-path /usr/lib/jvm/java-16-openjdk/lib/javafx.base.jar:/usr/lib/jvm/java-16-openjdk/lib/javafx.controls.jar:/usr/lib/jvm/java-16-openjdk/lib/javafx.graphics.jar:/usr/lib/jvm/java-16-openjdk/lib/javafx.swing.jar --add-modules javafx.base,javafx.controls,javafx.graphics,javafx.swing -jar /usr/share/java/mcaselector.jar "$@"
+export PATH="/usr/lib/jvm/java-${JV}-openjdk/bin/:$PATH"
+
+java --module-path /usr/lib/jvm/java-${JV}-openjdk/lib/javafx.base.jar:/usr/lib/jvm/java-${JV}-openjdk/lib/javafx.controls.jar:/usr/lib/jvm/java-${JV}-openjdk/lib/javafx.graphics.jar:/usr/lib/jvm/java-${JV}-openjdk/lib/javafx.swing.jar --add-modules javafx.base,javafx.controls,javafx.graphics,javafx.swing -jar /usr/share/java/mcaselector.jar "$@"