diff options
-rw-r--r-- | .SRCINFO | 12 | ||||
-rw-r--r-- | PKGBUILD | 10 | ||||
-rw-r--r-- | tvbrowser.sh | 11 |
3 files changed, 20 insertions, 13 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Fri Jun 3 18:24:06 UTC 2016 +# Tue Jun 27 18:48:00 UTC 2017 pkgbase = tvbrowser pkgdesc = Java-based TV guide which is easily extensible using plugins - pkgver = 3.4.4 + pkgver = 4 pkgrel = 1 url = http://www.tvbrowser.org arch = any @@ -10,14 +10,14 @@ pkgbase = tvbrowser depends = bash depends = giflib depends = hicolor-icon-theme - depends = java-runtime - source = http://downloads.sourceforge.net/project/tvbrowser/TV-Browser%20Releases%20%28Java%206%20and%20higher%29/3.4.4/tvbrowser_3.4.4_bin.tar.gz + 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 = fa5badf02e52a35817ecdc22d233b5bb91864d75664cd35e04c67b876a79fb3d + sha256sums = c969e561dd0b0227ea9b2c209c95029f7f5e0cb9b215a9b00ea390e19fafad85 sha256sums = d5bcdf07965ef86fcaa0cb3e0dbde07ff370dd8af4e89d0d75f328e3c1631c4e - sha256sums = 9b7f35f6f30a2048ef70740929d327d34ac412dcf4c8850620370dafab6c1ca5 + sha256sums = e12f19023b1f7550a8b4d426f53b2297a9140bca5b53d88a63ee63894c77751f sha256sums = 61fe7278dcfb3a8b4557af36890cd68bc2e804b1e9bd1b6187e581c6d05e5693 pkgname = tvbrowser @@ -6,20 +6,20 @@ # https://github.com/michaellass/AUR pkgname=tvbrowser -pkgver=3.4.4 +pkgver=4 pkgrel=1 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') -source=(http://downloads.sourceforge.net/project/tvbrowser/TV-Browser%20Releases%20%28Java%206%20and%20higher%29/${pkgver}/tvbrowser_${pkgver}_bin.tar.gz +depends=('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=('fa5badf02e52a35817ecdc22d233b5bb91864d75664cd35e04c67b876a79fb3d' +sha256sums=('c969e561dd0b0227ea9b2c209c95029f7f5e0cb9b215a9b00ea390e19fafad85' 'd5bcdf07965ef86fcaa0cb3e0dbde07ff370dd8af4e89d0d75f328e3c1631c4e' - '9b7f35f6f30a2048ef70740929d327d34ac412dcf4c8850620370dafab6c1ca5' + 'e12f19023b1f7550a8b4d426f53b2297a9140bca5b53d88a63ee63894c77751f' '61fe7278dcfb3a8b4557af36890cd68bc2e804b1e9bd1b6187e581c6d05e5693') package () { diff --git a/tvbrowser.sh b/tvbrowser.sh index aa72000fab1b..0b946de433f5 100644 --- a/tvbrowser.sh +++ b/tvbrowser.sh @@ -1,4 +1,11 @@ #!/bin/sh -cd /usr/share/java/tvbrowser -java -jar tvbrowser.jar -ignorejvm "$@" +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 |