diff options
author | professorkaos64 | 2017-01-15 08:41:05 -0500 |
---|---|---|
committer | professorkaos64 | 2017-01-15 08:41:05 -0500 |
commit | 29ae05bcbf05a5abf860af9f9735886fa51a6ee9 (patch) | |
tree | 5c76d5bbac162df636fb7b0b53bd79dce3093f43 /PKGBUILD | |
parent | 95c920de1cb351275f40754d5ae225500249017b (diff) | |
download | aur-29ae05bcbf05a5abf860af9f9735886fa51a6ee9.tar.gz |
fix logic for build JAVA_HOME, prefer openjdk
Diffstat (limited to 'PKGBUILD')
-rw-r--r-- | PKGBUILD | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -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 |