summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorprofessorkaos642017-01-15 16:20:05 -0500
committerprofessorkaos642017-01-15 16:20:05 -0500
commit84a8f24b893d1b2d32e98a796205cd321f8394ae (patch)
tree233ccacf4983cca05a5f66f7b1bd30b50f7229ca
parent29ae05bcbf05a5abf860af9f9735886fa51a6ee9 (diff)
downloadaur-84a8f24b893d1b2d32e98a796205cd321f8394ae.tar.gz
try to appease those using openjdk and oraclejdk
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD20
2 files changed, 16 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bb59d67717d..f2fe2161a15 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = playonlinux5-git
pkgdesc = GUI for managing Windows programs under linux (development version based on Java)
- pkgver = r1489.21c3c626
- pkgrel = 1
+ pkgver = r1491.09432248
+ pkgrel = 2
epoch = 2
url = http://www.playonlinux.com/
arch = any
diff --git a/PKGBUILD b/PKGBUILD
index a648822937d..3b6889df61b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,8 +10,8 @@
_pkgname=playonlinux5
pkgname=$_pkgname-git
-pkgver=r1489.21c3c626
-pkgrel=1
+pkgver=r1491.09432248
+pkgrel=2
epoch=2
pkgdesc="GUI for managing Windows programs under linux (development version based on Java)"
arch=('any')
@@ -44,10 +44,18 @@ build() {
# Set environment
# Use path to Java 8 for users not defaulted to Java 8 yet
- if (( $(archlinux-java get | cut -d "-" -f2) < 8 )); then
- export JAVA_HOME=$(ls /usr/lib/jvm/java-{8,9}-*/bin/javac 2>/dev/null | cut -d "/" -f-5 | awk '/-8-openjdk/')
- else
- export JAVA_HOME=$(ls /usr/lib/jvm/java-{8,9}-*/bin/javac 2>/dev/null | cut -d "/" -f-5 | awk '/-8-jdk/')
+ if [[ $(archlinux-java get | cut -d "-" -f2) < 8 ]]; then
+
+ # test for openjdk, fall back on oracle jdk if not present
+ openjdk=$(ls /usr/lib/jvm/java-8-*/bin/javac 2>/dev/null | cut -d "/" -f-5 | awk '/-8-openjdk/')
+ oraclejdk=$(ls /usr/lib/jvm/java-8-*/bin/javac 2>/dev/null | cut -d "/" -f-5 | awk '/-8-jdk/')
+
+ if [[ "${openjdk}" != "" ]]; then
+ export JAVA_HOME=$(ls /usr/lib/jvm/java-8-*/bin/javac 2>/dev/null | cut -d "/" -f-5 | awk '/-openjdk/')
+ elif [[ "${oraclejdk}" != "" ]]; then
+ export JAVA_HOME=$(ls /usr/lib/jvm/java-8-*/bin/javac 2>/dev/null | cut -d "/" -f-5 | awk '/-jdk/')
+ fi
+
fi
# Build