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 | |
| 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!
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 4 | ||||
| -rw-r--r-- | jabref.sh | 10 |
3 files changed, 12 insertions, 8 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Thu Feb 2 21:36:10 UTC 2017 +# Fri Feb 3 14:13:19 UTC 2017 pkgbase = jabref pkgdesc = GUI frontend for BibTeX, written in Java pkgver = 3.8.2 - pkgrel = 1 + pkgrel = 2 url = http://www.jabref.org/ arch = any license = MIT @@ -16,7 +16,7 @@ pkgbase = jabref source = jabref.desktop sha256sums = f7226e9eb64f96ef2d179c4b1f9e9bcd7a630d247f2feb0ecaa243408379720a sha256sums = 19f74c294c572a431e0fadc00671aa5ca77149f8d0572fc01d5944eba06b0c6c - sha256sums = 0355f5135a6d855416160d4ff1cf8fe5e55921088b83491647b6a714dae87dda + sha256sums = d5d31399586f0d76f0e408620a2d868e5c830708d350385a2281bc2138ecd607 sha256sums = f958793f6e408bab7db84973169b30ed61077112d3f552dbcc9f068847317602 pkgname = jabref @@ -8,7 +8,7 @@ pkgname=jabref pkgver=3.8.2 -pkgrel=1 +pkgrel=2 pkgdesc="GUI frontend for BibTeX, written in Java" arch=('any') url="http://www.jabref.org/" @@ -24,7 +24,7 @@ source=(https://github.com/JabRef/jabref/releases/download/v${pkgver}/JabRef-${p noextract=(JabRef-${pkgver}.jar) sha256sums=('f7226e9eb64f96ef2d179c4b1f9e9bcd7a630d247f2feb0ecaa243408379720a' '19f74c294c572a431e0fadc00671aa5ca77149f8d0572fc01d5944eba06b0c6c' - '0355f5135a6d855416160d4ff1cf8fe5e55921088b83491647b6a714dae87dda' + 'd5d31399586f0d76f0e408620a2d868e5c830708d350385a2281bc2138ecd607' 'f958793f6e408bab7db84973169b30ed61077112d3f552dbcc9f068847317602') prepare() { 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 |