summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorprofessorkaos642017-01-14 15:25:13 -0500
committerprofessorkaos642017-01-14 15:25:13 -0500
commitd166d04641ca797658c2f3bc727ddcc997073aea (patch)
tree6e602212414d083c6ff2054fcf752ee56ac4253b
parent1060bc70d118cbfa750c89302ecc658bc346c29c (diff)
downloadaur-d166d04641ca797658c2f3bc727ddcc997073aea.tar.gz
fix extra JAVA_HOME, script java ver
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD8
-rwxr-xr-xPlayOnLinux.sh2
3 files changed, 7 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9b9dba22838..fadf0aac839 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 = r1409.8cb20ab7
- pkgrel = 3
+ pkgver = r1486.178b8e1a
+ pkgrel = 1
epoch = 2
url = http://www.playonlinux.com/
arch = any
@@ -19,7 +19,7 @@ pkgbase = playonlinux5-git
source = PlayOnLinux.sh
sha256sums = SKIP
sha256sums = 4703fc813fb18d3e414cc1483f03cb3c0c306e5725b7681b3dbc43fb7f6630de
- sha256sums = 4fc408312c26aee5ea0c2aba922025b4fba0503b274df2912a7b3934ec1df125
+ sha256sums = a9a9c3d5ba3e9ebdbfe8153813a068ad703794bc6c9a4c6862a9a4c437ad2157
pkgname = playonlinux5-git
diff --git a/PKGBUILD b/PKGBUILD
index 2f068ecd7b6..ffacb173779 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,8 +10,8 @@
_pkgname=playonlinux5
pkgname=$_pkgname-git
-pkgver=r1409.8cb20ab7
-pkgrel=3
+pkgver=r1486.178b8e1a
+pkgrel=1
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'
- '4fc408312c26aee5ea0c2aba922025b4fba0503b274df2912a7b3934ec1df125'
+ 'a9a9c3d5ba3e9ebdbfe8153813a068ad703794bc6c9a4c6862a9a4c437ad2157'
)
pkgver() {
@@ -47,8 +47,6 @@ build() {
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
diff --git a/PlayOnLinux.sh b/PlayOnLinux.sh
index 7f9429be1c0..160c9262e9b 100755
--- a/PlayOnLinux.sh
+++ b/PlayOnLinux.sh
@@ -5,7 +5,7 @@ CLASSPATH=${CLASSPATH}:$POL_HOME/lib/*
# Allow either openjdk java or Oracle java to be used
-if (( $(archlinux-java get | cut -d "-" -f2) < 7 )); then
+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
fi