fix logic for build JAVA_HOME, prefer openjdk

2 files changed, 6 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 62089e3c05ff..bb59d67717d8 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 = r1486.178b8e1a
-	pkgrel = 4
+	pkgver = r1489.21c3c626
+	pkgrel = 1
 	epoch = 2
 	url = http://www.playonlinux.com/
 	arch = any
diff --git a/PKGBUILD b/PKGBUILD
index 5afff6ce0c80..a648822937d8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,8 +10,8 @@
 
 _pkgname=playonlinux5
 pkgname=$_pkgname-git
-pkgver=r1486.178b8e1a
-pkgrel=4
+pkgver=r1489.21c3c626
+pkgrel=1
 epoch=2
 pkgdesc="GUI for managing Windows programs under linux (development version based on Java)"
 arch=('any')
@@ -45,10 +45,9 @@ 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
-	JAVA_VER=$(archlinux-java get)
-	export JAVA_HOME="/usr/lib/jvm/${JAVA_VER}"
+	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 | head -1)
+	export JAVA_HOME=$(ls /usr/lib/jvm/java-{8,9}-*/bin/javac 2>/dev/null | cut -d "/" -f-5 | awk '/-8-jdk/')
   fi
 
   # Build