summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax2014-10-02 14:19:29 -0400
committerMax2015-06-08 09:41:20 -0400
commit44812e19446a1b0b251ba2f2d711d6b721330454 (patch)
tree2462ff890bf15b2cd233f5e908d87c7d5d2689dd
parentd685f723efc54b8d278210cee76a97a8d7b834d4 (diff)
downloadaur-44812e19446a1b0b251ba2f2d711d6b721330454.tar.gz
Add Java version checks when building/running
-rw-r--r--PKGBUILD3
-rw-r--r--gcs.sh5
2 files changed, 8 insertions, 0 deletions
diff --git a/PKGBUILD b/PKGBUILD
index fed4552f0f31..d9d35d67a74e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,6 +22,9 @@ prepare() {
}
build() {
+ echo "Checking that Java is version 8..."
+ java -version 2>&1 | grep 'version "1.8' >/dev/null
+
cd "$srcdir/apple_stubs"
ant
cd "$srcdir/toolkit"
diff --git a/gcs.sh b/gcs.sh
index 81d472171dd6..46276318c5f0 100644
--- a/gcs.sh
+++ b/gcs.sh
@@ -1,2 +1,7 @@
#!/bin/sh
+if ! "$JAVA_HOME/bin/java" -version 2>&1 | grep 'version "1.8' >/dev/null
+then
+ echo "GURPS character sheet requires Java 8" >&2
+ exit 1
+fi
GCS_HOME=/usr/share/gcs exec "$JAVA_HOME/bin/java" -jar '/usr/share/java/gcs/gcs.jar'