Updated to 1.3.5, added emptydirs option, removed unneeded 'dirty fix' for gopkg

1 files changed, 17 insertions, 17 deletions

diff --git a/PKGBUILD b/PKGBUILD
index de2ac3ec246b..9f12c3a9346f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Nicolas Leclercq <nicolas.private@gmail.com>
 
 pkgname='telegraf'
-pkgver='1.3.1'
+pkgver='1.3.5'
 pkgrel='1'
 pkgdesc='Server-level metric gathering agent for InfluxDB'
 arch=('i686' 'x86_64' 'armv6h' 'armv7h')
@@ -12,6 +12,7 @@ makedepends=('go' 'git')
 provides=('telegraf')
 backup=('etc/telegraf/telegraf.conf')
 install="telegraf.install"
+options=('emptydirs')
 source=("git+https://github.com/influxdata/telegraf#tag=$pkgver"
         'telegraf.install'
         'telegraf.sysusers'
@@ -26,35 +27,34 @@ build()
   export GOPATH="$srcdir"
   export GOBIN="$GOPATH/bin"
   export PATH="$GOBIN:$PATH"
-  mkdir -p "$GOPATH/src/github.com/influxdata"
-  mv -f "$srcdir/telegraf" "$GOPATH/src/github.com/influxdata/"
+  mkdir -p $GOPATH/src/github.com/influxdata
+  mv -f $srcdir/telegraf $GOPATH/src/github.com/influxdata/
 
   cd "$GOPATH/src/github.com/influxdata/telegraf"
 
   echo "Downloading dependencies"
-  # dirty fix for brocken gopkg
-  # https://github.com/niemeyer/gopkg/issues/50
-  git config --global http.https://gopkg.in.followRedirects true
   go get github.com/sparrc/gdm
   gdm restore
 
   revision=`git rev-parse HEAD`
   version=`git describe --tags`
-  echo "Building telegraf version=$version commit=$revision branch=master"
-	go install -ldflags="-X main.Version=$version -X main.commit=$revision -X main.branch=master" ./...
+  echo "Building influxdb version=$version commit=$revision branch=master"
+  _LDFLAGS="-X main.version=$version -X main.commit=$revision -X main.branch=master"
+  go install -ldflags="$_LDFLAGS" ./...
 }
+
 package()
 {
- 	cd $srcdir
-  install -Dm644 telegraf.sysusers "$pkgdir/usr/lib/sysusers.d/telegraf.conf"
-  install -Dm644 telegraf.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/telegraf.conf"
+  cd $srcdir
+  install -Dm644 telegraf.sysusers $pkgdir/usr/lib/sysusers.d/telegraf.conf
+  install -Dm644 telegraf.tmpfiles $pkgdir/usr/lib/tmpfiles.d/telegraf.conf
 
   cd $GOBIN
-  install -Dsm755 telegraf "$pkgdir/usr/bin/telegraf"
+  install -Dsm755 telegraf $pkgdir/usr/bin/telegraf
 
-  cd "$GOPATH/src/github.com/influxdata/telegraf"
-  install -Dm644 scripts/telegraf.service "$pkgdir/usr/lib/systemd/system/telegraf.service"
-  install -Dm644 "etc/telegraf.conf" "$pkgdir/etc/telegraf/telegraf.conf"
-  mkdir "$pkgdir/etc/telegraf/telegraf.d"
-  install -Dm644 "LICENSE" "${pkgdir}/usr/share/licenses/telegraf/LICENSE"
+  cd $GOPATH/src/github.com/influxdata/telegraf
+  install -d $pkgdir/etc/telegraf/telegraf.d/
+  install -Dm644 scripts/telegraf.service $pkgdir/usr/lib/systemd/system/telegraf.service
+  install -Dm644 etc/telegraf.conf $pkgdir/etc/telegraf/telegraf.conf
+  install -Dm644 LICENSE $pkgdir/usr/share/licenses/telegraf/LICENSE
 }