diff options
| author | Michael Lass | 2017-02-03 15:10:52 +0100 |
|---|---|---|
| committer | Michael Lass | 2017-02-03 15:13:25 +0100 |
| commit | 514e1b863a32745a23150195e8c0235b3c650e6b (patch) | |
| tree | 2485caa44548f3605392b67552a6ad81a93c4427 /jabref.sh | |
| parent | 5616a2014121fb4fb85435b9516d6593377dbc26 (diff) | |
| download | aur-514e1b863a32745a23150195e8c0235b3c650e6b.tar.gz | |
Improve start script
If a suitable java version is selected via archlinux-java we should use it.
Otherwise use the latest version available as we did before.
Thanks a lot to Rhinoceros for providing this solution!
Diffstat (limited to 'jabref.sh')
| -rw-r--r-- | jabref.sh | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/jabref.sh b/jabref.sh index 713274d78bfd..48a18625c77b 100644 --- a/jabref.sh +++ b/jabref.sh @@ -1,5 +1,9 @@ #!/bin/sh -# Force usage of latest java version -JVM_PATH=$(find /usr/lib/jvm/* -maxdepth 0 -type d | sort | tail -n1) -exec $JVM_PATH/jre/bin/java -jar /usr/share/java/jabref/JabRef-VERSION.jar "$@" +if [[ "$(archlinux-java get)" == java-8-* ]]; then + exec /usr/bin/java -jar /usr/share/java/jabref/JabRef-VERSION.jar "$@" +else + # Force usage of latest java version + JVM_PATH=$(find /usr/lib/jvm/* -maxdepth 0 -type d | sort | tail -n1) + exec $JVM_PATH/jre/bin/java -jar /usr/share/java/jabref/JabRef-VERSION.jar "$@" +fi |