summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin Dray2015-06-12 10:28:00 +1000
committerJustin Dray2015-06-12 10:28:00 +1000
commit60ef23c1ee072d1ddc13cf863d1e9618c0e2f857 (patch)
tree2e832599d44a53d9d0a3536439b1e3a1ff479218
parent0dcffd2bdc923314be168ffc237b86e599801f8b (diff)
downloadaur-60ef23c1ee072d1ddc13cf863d1e9618c0e2f857.tar.gz
Update to: v2.0.2.r331.g3675b3f-1 - Cleaned up install script
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD2
-rw-r--r--grafana.install16
3 files changed, 10 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3544331890a1..acd2f9d2a8b1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = grafana-git
pkgdesc = A general purpose dashboard and graph composer. It supports graphite, influxdb or opentsdb
- pkgver = v2.0.2.r282.gc5d3eb5
+ pkgver = v2.0.2.r331.g3675b3f
pkgrel = 1
url = http://grafana.org
install = grafana.install
diff --git a/PKGBUILD b/PKGBUILD
index a78e499d7580..ab93d0cd8cd2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Gilles Hamel <hamelg at laposte dot net>
_pkgname=grafana
pkgname=${_pkgname}-git
-pkgver=v2.0.2.r282.gc5d3eb5
+pkgver=v2.0.2.r331.g3675b3f
pkgrel=1
pkgdesc="A general purpose dashboard and graph composer. It supports graphite, influxdb or opentsdb"
url="http://grafana.org"
diff --git a/grafana.install b/grafana.install
index f55675d2b312..e7de86c54ed7 100644
--- a/grafana.install
+++ b/grafana.install
@@ -1,10 +1,10 @@
-post_install() {
- id grafana 2>/dev/null || useradd -d /var/lib/grafana -r -U -M -s /bin/false grafana
- mkdir -p "/var/lib/grafana" "/var/log/grafana/"
- chown grafana.grafana /var/lib/grafana /var/log/grafana
+post_upgrade() {
+ post_install
}
-
-post_remove() {
- userdel grafana
-} \ No newline at end of file
+post_install() {
+ getent group grafana >/dev/null || groupadd -r grafana
+ getent passwd grafana >/dev/null || useradd -d /var/lib/grafana -r -U -M -s /bin/false grafana
+ mkdir -p /var/{lib,log}/grafana
+ chown grafana:grafana /var/lib/grafana /var/log/grafana
+}