diff options
Diffstat (limited to 'PlayOnLinux.sh')
-rwxr-xr-x | PlayOnLinux.sh | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/PlayOnLinux.sh b/PlayOnLinux.sh index 0ae1b310c9dd..719c33efc08a 100755 --- a/PlayOnLinux.sh +++ b/PlayOnLinux.sh @@ -3,13 +3,10 @@ POL_HOME=/opt/playonlinux5 CLASSPATH=${CLASSPATH}:$POL_HOME/lib/* -# Ensure we are using the right java env -# Don't necessarily force default Java 8, as it is not the default for Arch Linux right now -# This handles users with Java 7 and 8 -export PATH=/usr/lib/jvm/java-8-openjdk/jre/bin/:$PATH +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 -java -classpath "$CLASSPATH" com.playonlinux.app.PlayOnLinuxApp "$@" - -# Unset vars? -# Note: Java version can be sourced with this one liner: -# IFS=\" read -r _ version _ < <(java -version 2>&1); printf %s\\n "$version +java -classpath "$CLASSPATH" com.playonlinux.javafx.JavaFXApplication "$@" |