diff options
| author | Brecht Serckx | 2019-02-21 11:19:19 +0100 |
|---|---|---|
| committer | Brecht Serckx | 2019-02-21 11:19:19 +0100 |
| commit | 750d17fcc8105d0d8d2675464626bc1934e356b7 (patch) | |
| tree | 5d928ca15de2d036f4d7b62b80c756eed878d2ea | |
| parent | 8be52d621abbfcf137cf86227e3fc2473b449f36 (diff) | |
| download | aur-750d17fcc8105d0d8d2675464626bc1934e356b7.tar.gz | |
r1028, updated java dep
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 18 |
2 files changed, 17 insertions, 5 deletions
@@ -1,12 +1,12 @@ pkgbase = rambox-os-git pkgdesc = Free and Open Source messaging and emailing app that combines common web applications into one. - pkgver = r1027.b02a615 + pkgver = r1028.da3e283 pkgrel = 1 url = https://github.com/TheGoddessInari/rambox arch = i686 arch = x86_64 license = GPL3 - makedepends = jre8-openjdk + makedepends = java-runtime=8 makedepends = git makedepends = desktop-file-utils makedepends = ruby @@ -2,14 +2,14 @@ # Contributor: Philipp A. <flying-sheep@web.de> # Contributor: theSander <aur@sandervanbalen.be> pkgname=rambox-os-git -pkgver=r1027.b02a615 +pkgver=r1028.da3e283 pkgrel=1 pkgdesc="Free and Open Source messaging and emailing app that combines common web applications into one." arch=(i686 x86_64) url="https://github.com/TheGoddessInari/rambox" license=('GPL3') depends=(electron) -makedepends=('jre8-openjdk' 'git' 'desktop-file-utils' 'ruby' 'npm' 'sencha-cmd-6') +makedepends=('java-runtime=8' 'git' 'desktop-file-utils' 'ruby' 'npm' 'sencha-cmd-6') provides=("${pkgname%-git}") conflicts=("${pkgname%-git}" "rambox" "rambox-bin") replaces=() @@ -35,9 +35,21 @@ prepare() { } build() { + # get jdk 8 + if [ ! -z "$(archlinux-java get | grep 8)" ]; then + _JDK="$(archlinux-java get)" + else + _JDK=$(archlinux-java status \ + | grep java | grep 8 \ + | sed -e 's/^[[:space:]]*//' | cut -d "/" -f1 \ + | head -n1) + fi + + # build cd "$srcdir/${pkgname%-git}" npm install - env PATH="/usr/lib/jvm/java-8-openjdk/jre/bin/:$PATH" npm run repack:linux64 + # build with a jdk 8 + env PATH="/usr/lib/jvm/$_JDK/jre/bin/:$PATH" npm run repack:linux64 } package() { |