diff options
| author | Michael Lass | 2017-11-18 23:09:25 +0100 |
|---|---|---|
| committer | Michael Lass | 2017-11-18 23:10:56 +0100 |
| commit | a81ab4f8b4ad9ab7242c009f7e028f43cb5992b3 (patch) | |
| tree | 6fc0438986960582dde9d93de2b90e9f8211f6dd | |
| parent | e1ea76b06d11f61c305b922f93247514bd94845e (diff) | |
| download | aur-a81ab4f8b4ad9ab7242c009f7e028f43cb5992b3.tar.gz | |
Force Java 8 and make use of archlinux-java-run
| -rw-r--r-- | .SRCINFO | 9 | ||||
| -rw-r--r-- | PKGBUILD | 6 | ||||
| -rw-r--r-- | tvbrowser.sh | 9 |
3 files changed, 9 insertions, 15 deletions
@@ -1,23 +1,24 @@ # Generated by mksrcinfo v8 -# Tue Jun 27 18:48:00 UTC 2017 +# Sat Nov 18 22:10:49 UTC 2017 pkgbase = tvbrowser pkgdesc = Java-based TV guide which is easily extensible using plugins pkgver = 4 - pkgrel = 1 + pkgrel = 2 url = http://www.tvbrowser.org arch = any license = GPL3 + depends = archlinux-java-run depends = bash depends = giflib depends = hicolor-icon-theme - depends = java-runtime>=8 + depends = java-runtime=8 source = http://downloads.sourceforge.net/project/tvbrowser/TV-Browser%20Releases%20%28Java%208%20and%20higher%29/4/tvbrowser_4_bin.tar.gz source = http://www.tvbrowser.org/images/tvbrowser/tvbrowser_logo.svg source = tvbrowser.sh source = tvbrowser.desktop sha256sums = c969e561dd0b0227ea9b2c209c95029f7f5e0cb9b215a9b00ea390e19fafad85 sha256sums = d5bcdf07965ef86fcaa0cb3e0dbde07ff370dd8af4e89d0d75f328e3c1631c4e - sha256sums = e12f19023b1f7550a8b4d426f53b2297a9140bca5b53d88a63ee63894c77751f + sha256sums = 9dce6d4532bd1404088010cdd8a73d5b591bc827d0f4f4c76074e003a2136c68 sha256sums = 61fe7278dcfb3a8b4557af36890cd68bc2e804b1e9bd1b6187e581c6d05e5693 pkgname = tvbrowser @@ -7,19 +7,19 @@ pkgname=tvbrowser pkgver=4 -pkgrel=1 +pkgrel=2 pkgdesc="Java-based TV guide which is easily extensible using plugins" arch=('any') url="http://www.tvbrowser.org" license=('GPL3') -depends=('bash' 'giflib' 'hicolor-icon-theme' 'java-runtime>=8') +depends=('archlinux-java-run' 'bash' 'giflib' 'hicolor-icon-theme' 'java-runtime=8') source=(http://downloads.sourceforge.net/project/tvbrowser/TV-Browser%20Releases%20%28Java%208%20and%20higher%29/${pkgver}/tvbrowser_${pkgver}_bin.tar.gz http://www.tvbrowser.org/images/$pkgname/${pkgname}_logo.svg $pkgname.sh $pkgname.desktop) sha256sums=('c969e561dd0b0227ea9b2c209c95029f7f5e0cb9b215a9b00ea390e19fafad85' 'd5bcdf07965ef86fcaa0cb3e0dbde07ff370dd8af4e89d0d75f328e3c1631c4e' - 'e12f19023b1f7550a8b4d426f53b2297a9140bca5b53d88a63ee63894c77751f' + '9dce6d4532bd1404088010cdd8a73d5b591bc827d0f4f4c76074e003a2136c68' '61fe7278dcfb3a8b4557af36890cd68bc2e804b1e9bd1b6187e581c6d05e5693') package () { diff --git a/tvbrowser.sh b/tvbrowser.sh index 0b946de433f5..3d64ccd64cd8 100644 --- a/tvbrowser.sh +++ b/tvbrowser.sh @@ -1,11 +1,4 @@ #!/bin/sh cd /usr/share/java/tvbrowser/ - -if [[ "$(archlinux-java get)" == java-8-* ]]; then - exec /usr/bin/java -jar tvbrowser.jar -ignorejvm "$@" -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 tvbrowser.jar -ignorejvm "$@" -fi +/usr/bin/archlinux-java-run --min 8 --max 8 -- -jar tvbrowser.jar "$@" |