diff options
author | GoliathLabs | 2020-05-16 14:57:43 +0200 |
---|---|---|
committer | GoliathLabs | 2020-05-16 14:57:43 +0200 |
commit | cfbddec30d01468cc2368943350bd40e9a45356c (patch) | |
tree | be655215d6e81bc163f483df2aacec50464b14af /PlayOnLinux.sh | |
parent | 92fcaade3c3a2a7cbc8c9c424d23e11f70aaccfa (diff) | |
download | aur-playonlinux5-git.tar.gz |
Updated: PKGBUILD
Diffstat (limited to 'PlayOnLinux.sh')
-rwxr-xr-x | PlayOnLinux.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/PlayOnLinux.sh b/PlayOnLinux.sh index b91952c90f01..883831afae89 100755 --- a/PlayOnLinux.sh +++ b/PlayOnLinux.sh @@ -12,15 +12,15 @@ POL_HOME=/opt/playonlinux5 CLASSPATH=${CLASSPATH}:$POL_HOME/lib/* # Test for active java -_openjdk=$(ls -d /usr/lib/jvm/java-{8,9}-openjdk* 2>/dev/null | head -1) -_oraclejdk=$(ls -d /usr/lib/jvm/java-{8,9}-jdk* 2>/dev/null | head -1) -_opendjdk_jetbrains=$(ls -d /usr/lib/jvm/java-{8,9}-openjdk-jetbrains* 2>/dev/null | head -1) +_openjdk=$(ls -d /usr/lib/jvm/java-{11,12,13,14}-openjdk* 2>/dev/null | head -1) +_oraclejdk=$(ls -d /usr/lib/jvm/java-{11,12,13,14}-jdk* 2>/dev/null | head -1) +_opendjdk_jetbrains=$(ls -d /usr/lib/jvm/java-{11,12,13,14}-openjdk-jetbrains* 2>/dev/null | head -1) # Allow either openjdk java or Oracle java to be used if (( $(archlinux-java get | cut -d "-" -f2) < 8 )); then - echo "WARNING: A JVM of version 8 or higher was not found" + echo "WARNING: A JVM of version 11 or higher was not found" java_default=$(archlinux-java get) echo -e "\t==> Picked up default Java of: $java_default" echo -e "\t==> Assessing if we have java version 8 or higher..." @@ -70,7 +70,7 @@ if [[ "$JAVA_FX_BOOLEAN" = "False" ]]; then echo "Switching to OpenJDK" elif [[ "${_oraclejdk}" ]]; then - export JAVA_HOME=$(ls /usr/lib/jvm/java-{8,9}-jdk*/bin/javac 2>/dev/null | cut -d "/" -f-5 | head -1) + export JAVA_HOME=$(ls /usr/lib/jvm/java-{11,12,13,14}-jdk*/bin/javac 2>/dev/null | cut -d "/" -f-5 | head -1) msg2 "Switching to Oracle JDK" else msg2 "ERROR: Could not find a proper java build environment. Exiting" |