summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
-rwxr-xr-xPlayOnLinux.sh3
3 files changed, 7 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8e92164fd92..c5eced03cdb 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 = r1328.6376ad23
- pkgrel = 3
+ pkgrel = 4
epoch = 2
url = http://www.playonlinux.com/
arch = any
@@ -18,7 +18,7 @@ pkgbase = playonlinux5-git
source = PlayOnLinux.sh
sha256sums = SKIP
sha256sums = 4703fc813fb18d3e414cc1483f03cb3c0c306e5725b7681b3dbc43fb7f6630de
- sha256sums = 9deabf8918a55e5726d9708e074a3420701f89f57748779f78a8ee681fbe97e4
+ sha256sums = 44478a1cc7421a71253b1d7e79096153f052088c5d167686d69ca955fe432de4
pkgname = playonlinux5-git
diff --git a/PKGBUILD b/PKGBUILD
index 7cef647a0a5..522e01f209b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@
_pkgname=playonlinux5
pkgname=$_pkgname-git
pkgver=r1328.6376ad23
-pkgrel=3
+pkgrel=4
epoch=2
pkgdesc="GUI for managing Windows programs under linux (development version based on Java)"
arch=('any')
@@ -28,7 +28,7 @@ source=(
sha256sums=(
'SKIP'
'4703fc813fb18d3e414cc1483f03cb3c0c306e5725b7681b3dbc43fb7f6630de'
- '9deabf8918a55e5726d9708e074a3420701f89f57748779f78a8ee681fbe97e4'
+ '44478a1cc7421a71253b1d7e79096153f052088c5d167686d69ca955fe432de4'
)
pkgver() {
diff --git a/PlayOnLinux.sh b/PlayOnLinux.sh
index 719c33efc08..c08a442ef13 100755
--- a/PlayOnLinux.sh
+++ b/PlayOnLinux.sh
@@ -3,10 +3,13 @@
POL_HOME=/opt/playonlinux5
CLASSPATH=${CLASSPATH}:$POL_HOME/lib/*
+# Allow either openjdk java or Oracle java to be used
+
if [[ $(archlinux-java get | cut -d "-" -f2) -ge 8 ]]; then
export JAVA_HOME=$(archlinux-java get)
else
export JAVA_HOME=$(ls /usr/lib/jvm/java-{8,9}-*/bin/javac 2>/dev/null | cut -d "/" -f-5 | head -1)
fi
+# Start PlayOnLinux
java -classpath "$CLASSPATH" com.playonlinux.javafx.JavaFXApplication "$@"