workaround for those defaulted to java 7

3 files changed, 7 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ecdf2d6204de..464eee803f20 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = playonlinux5-git
 	pkgdesc = GUI for managing Windows programs under linux (development version based on Java)
-	pkgver = r1735.38d41ea4
+	pkgver = r1784.151328a6
 	pkgrel = 1
 	epoch = 2
 	url = http://www.playonlinux.com/
@@ -19,7 +19,7 @@ pkgbase = playonlinux5-git
 	source = PlayOnLinux.sh
 	md5sums = SKIP
 	md5sums = 7fe925810fc7ec6d8745817b1c541e7b
-	md5sums = 60c82a463c2023368132c9b305887ada
+	md5sums = 77201d6c6376d4dd8340ad47a0f47cf7
 
 pkgname = playonlinux5-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 94f534013af5..fbf671ca0343 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@
 
 _pkgname=playonlinux5
 pkgname=${_pkgname}-git
-pkgver=r1735.38d41ea4
+pkgver=r1784.151328a6
 pkgrel=1
 epoch=2
 pkgdesc="GUI for managing Windows programs under linux (development version based on Java)"
@@ -29,7 +29,7 @@ source=(
 md5sums=(
 	'SKIP'
 	'7fe925810fc7ec6d8745817b1c541e7b'
-	'60c82a463c2023368132c9b305887ada'
+	'77201d6c6376d4dd8340ad47a0f47cf7'
 	)
 
 pkgver() {
diff --git a/PlayOnLinux.sh b/PlayOnLinux.sh
index 177db6275f26..27184d8a72c0 100755
--- a/PlayOnLinux.sh
+++ b/PlayOnLinux.sh
@@ -6,8 +6,9 @@ CLASSPATH=${CLASSPATH}:$POL_HOME/lib/*
 # Allow either openjdk java or Oracle java to be used
 
 if (( $(archlinux-java get | cut -d "-" -f2) < 8 )); then
-  export PATH=$(ls -d /usr/lib/jvm/java-{8,9}-* 2>/dev/null | head -1):$PATH
+  #export PATH=$(ls -d /usr/lib/jvm/java-{8,9}-* 2>/dev/null | head -1):$PATH
+  javaver=$(ls -d /usr/lib/jvm/java-{8,9}-* 2>/dev/null | head -1)
 fi
 
 # Start PlayOnLinux
-java -classpath "$CLASSPATH" org.phoenicis.javafx.JavaFXApplication "$@"
+$javaver/bin/java -classpath "$CLASSPATH" org.phoenicis.javafx.JavaFXApplication "$@"