summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorprofessorkaos642017-01-02 21:56:45 -0500
committerprofessorkaos642017-01-02 21:56:45 -0500
commit40a5f69bf0f64989e93720967783ea7ca126fed8 (patch)
tree75a37b6dcc32783a9d54853f098570e00d92093c
parentd64796d8146b2b65868140985ea619a63efdc235 (diff)
downloadaur-40a5f69bf0f64989e93720967783ea7ca126fed8.tar.gz
some fixes suggested by Det
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD21
-rwxr-xr-xPlayOnLinux.sh6
3 files changed, 18 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c5eced03cdb..c2b035853ef 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 = 4
+ pkgver = r1409.8cb20ab7
+ pkgrel = 1
epoch = 2
url = http://www.playonlinux.com/
arch = any
@@ -18,7 +18,7 @@ pkgbase = playonlinux5-git
source = PlayOnLinux.sh
sha256sums = SKIP
sha256sums = 4703fc813fb18d3e414cc1483f03cb3c0c306e5725b7681b3dbc43fb7f6630de
- sha256sums = 44478a1cc7421a71253b1d7e79096153f052088c5d167686d69ca955fe432de4
+ sha256sums = 4fc408312c26aee5ea0c2aba922025b4fba0503b274df2912a7b3934ec1df125
pkgname = playonlinux5-git
diff --git a/PKGBUILD b/PKGBUILD
index 522e01f209b..cf5c2773055 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,8 +10,8 @@
_pkgname=playonlinux5
pkgname=$_pkgname-git
-pkgver=r1328.6376ad23
-pkgrel=4
+pkgver=r1409.8cb20ab7
+pkgrel=1
epoch=2
pkgdesc="GUI for managing Windows programs under linux (development version based on Java)"
arch=('any')
@@ -21,14 +21,14 @@ makedepends=('git' 'gradle' 'maven' 'java-openjfx' 'java-environment>=8')
depends=('wine')
options=(!strip)
source=(
- "$_pkgname::git://github.com/PlayOnLinux/POL-POM-5.git"
+ "$_pkgname::git://github.com/PlayOnLinux/POL-POM-5.git"
'PlayOnLinux5.desktop'
- 'PlayOnLinux.sh'
- )
+ 'PlayOnLinux.sh'
+ )
sha256sums=(
'SKIP'
'4703fc813fb18d3e414cc1483f03cb3c0c306e5725b7681b3dbc43fb7f6630de'
- '44478a1cc7421a71253b1d7e79096153f052088c5d167686d69ca955fe432de4'
+ '4fc408312c26aee5ea0c2aba922025b4fba0503b274df2912a7b3934ec1df125'
)
pkgver() {
@@ -43,8 +43,13 @@ build() {
cd "$_pkgname"
# Set environment
- # Use path to Java 8 for users nkt defaulted to Java 8 yet
- export JAVA_HOME="/usr/lib/jvm/java-8-openjdk"
+ # 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}"
+ else
+ export JAVA_HOME=$(ls /usr/lib/jvm/java-{8,9}-*/bin/javac 2>/dev/null | cut -d "/" -f-5 | head -1)
+ fi
# Build
mvn package
diff --git a/PlayOnLinux.sh b/PlayOnLinux.sh
index c08a442ef13..7f9429be1c0 100755
--- a/PlayOnLinux.sh
+++ b/PlayOnLinux.sh
@@ -5,10 +5,8 @@ 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)
+if (( $(archlinux-java get | cut -d "-" -f2) < 7 )); then
+ export PATH=$(ls -d /usr/lib/jvm/java-{8,9}-* 2>/dev/null | head -1):$PATH
fi
# Start PlayOnLinux