diff options
| author | Matthew McGinn | 2018-11-06 12:32:04 +0100 |
|---|---|---|
| committer | Matthew McGinn | 2018-11-06 12:35:38 +0100 |
| commit | 6a36583f22194c4282d2bae6c8833006ffbb0aeb (patch) | |
| tree | 337676493023ea55b52e95c51769b41670f5d83a | |
| parent | 26a29541b3eeb3d98ec2b10ae8957618c047cf19 (diff) | |
| download | aur-6a36583f22194c4282d2bae6c8833006ffbb0aeb.tar.gz | |
update version
Signed-off-by: Matthew McGinn <mamcgi@gmail.com>
| -rw-r--r-- | .SRCINFO | 5 | ||||
| -rw-r--r-- | PKGBUILD | 16 |
2 files changed, 10 insertions, 11 deletions
@@ -1,15 +1,14 @@ # Generated by mksrcinfo v8 -# Tue Mar 6 00:47:52 UTC 2018 +# Tue Nov 6 11:32:07 UTC 2018 pkgbase = grafana-git pkgdesc = The tool for beautiful monitoring and metric analytics & dashboards for Graphite, InfluxDB & Prometheus & More - pkgver = v5.0.0.r67.g1a16e588f + pkgver = v5.0.0.r4041.ga3196a130e pkgrel = 1 url = https://grafana.com install = grafana.install arch = any license = APACHE makedepends = go - makedepends = nodejs-grunt-cli makedepends = npm makedepends = git makedepends = yarn @@ -2,14 +2,15 @@ # Contributor: Justin Dray <justin@dray.be> # Contributor: Gilles Hamel <hamelg at laposte dot net> _pkgname=grafana +_go_arch=$(go version | awk '{gsub("/","-",$NF); print $NF}') pkgname=${_pkgname}-git -pkgver=v5.0.0.r67.g1a16e588f +pkgver=v5.0.0.r4041.ga3196a130e pkgrel=1 pkgdesc=" The tool for beautiful monitoring and metric analytics & dashboards for Graphite, InfluxDB & Prometheus & More" url="https://grafana.com" arch=('any') license=('APACHE') -makedepends=('go' 'nodejs-grunt-cli' 'npm' 'git' 'yarn' 'python2') +makedepends=('go' 'npm' 'git' 'yarn' 'python2') provides=('grafana') options=('!strip' '!emptydirs') conflicts=('grafana') @@ -20,11 +21,10 @@ md5sums=('SKIP' 'bb223073eac39f0ccf9cb8b57fe8d685') pkgver() { - cd "${_pkgname}" - git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g' + cd "${srcdir}/${_pkgname}" + git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g' } - build() { export GOPATH="${srcdir}" export PATH="$PATH:$GOPATH" @@ -35,7 +35,7 @@ build() { go run build.go setup go run build.go build # Build frontend assets - yarn install --pure-lockfile + yarn install --pure-lockfile --ignore-engines npm run build } @@ -44,8 +44,8 @@ package() { cd "${srcdir}/${_pkgname}" install -dm755 "${pkgdir}/var/lib/grafana" install -dm755 "${pkgdir}/var/log/grafana" - install -Dsm755 bin/grafana-server "${pkgdir}/usr/bin/grafana-server" - install -Dsm755 bin/grafana-cli "${pkgdir}/usr/bin/grafana-cli" + install -Dsm755 bin/${_go_arch}/grafana-server "${pkgdir}/usr/bin/grafana-server" + install -Dsm755 bin/${_go_arch}/grafana-cli "${pkgdir}/usr/bin/grafana-cli" install -Dm644 conf/sample.ini "${pkgdir}/etc/${_pkgname}/${_pkgname}.ini" mkdir -p "${pkgdir}/usr/share/grafana" cp -r * "${pkgdir}/usr/share/grafana/" |