Add java version check.

2 files changed, 19 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2eb715536227..44551d6201d8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = maptool
 	pkgdesc = An open source virtual tabletop program
 	pkgver = 1.10.4
-	pkgrel = 1
+	pkgrel = 2
 	url = https://rptools.net/tools/maptool
 	install = maptool.install
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 83455d51b81e..968c07b85b80 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=maptool
 _pkgname=MapTool
 pkgver=1.10.4
-pkgrel=1
+pkgrel=2
 pkgdesc="An open source virtual tabletop program"
 arch=('x86_64')
 url="https://rptools.net/tools/maptool"
@@ -16,8 +16,19 @@ source=("git+https://github.com/RPTools/${pkgname}.git#tag=${pkgver}")
 sha256sums=('SKIP')
 install='maptool.install'
 
+_prefix="/opt/$pkgname"
+
 prepare() {
 	cd "${pkgname}"
+	
+	_java_version=$(java --version | head -n 1 | sed -r 's/openjdk ([[:digit:]]+).*/\1/')
+	if (( _java_version < 16 )); then
+		>&2 echo
+		>&2 echo "MapTool require a version of java of a least 16. See archlinux-java on how to change the default java on your system."
+		>&2 echo
+		return 1
+	fi
+	
 	sed -i -r 's|jdkHome = jdkDownload.+$|jdkHome = "/usr/lib/jvm/default"|' 'build.gradle'
 }
 
@@ -34,18 +45,19 @@ check() {
 package() {
 	cd "${pkgdir}"
 	
-	dpkg-deb -x "${srcdir}/${pkgname}/releases/${pkgname}_${pkgver}-${pkgrel}_amd64.deb" .
+	dpkg-deb -x "${srcdir}/${pkgname}/releases/${pkgname}_${pkgver}-1_amd64.deb" .
 	mkdir -p "usr/share/licenses/${pkgname}"
-	mv "opt/${pkgname}/share/doc/copyright" "usr/share/licenses/${pkgname}/"
-	rm -rf "opt/${pkgname}/share"
+	mv "${pkgdir}/${_prefix}/share/doc/copyright" "usr/share/licenses/${pkgname}/"
+	rm -rf "${pkgdir}/${_prefix}/share"
 	
 	#rpmextract.sh "${srcdir}/${pkgname}/releases/${pkgname}-${pkgver}-${pkgrel}.x86_64.rpm"
 	#mv "usr/share/licenses/maptool-${pkgver}" "usr/share/licenses/${pkgname}"
 	
-	install -Dm644 "opt/${pkgname}/lib/${pkgname}-${_pkgname}.desktop" -t "usr/share/applications/"
+	install -dm755 'usr/share/applications'
+	mv "${pkgdir}/${_prefix}/lib/${pkgname}-${_pkgname}.desktop" "usr/share/applications/${pkgname}.desktop"
 	
 	install -dm755 'usr/bin'
 	echo "#!/bin/bash" > "usr/bin/${pkgname}"
-	echo "/opt/${pkgname}/bin/MapTool \"\$@\"" >> "usr/bin/${pkgname}"
+	echo "${_prefix}/bin/MapTool \"\$@\"" >> "usr/bin/${pkgname}"
 	chmod 755 "usr/bin/${pkgname}"
 }