export $GOBIN explicitly, use bundled service file

1 files changed, 7 insertions, 9 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 18dea1917b0b..9b6bd47057f6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,18 +15,17 @@ install="telegraf.install"
 source=("git+https://github.com/influxdata/telegraf#tag=$pkgver"
         'telegraf.install'
         'telegraf.sysusers'
-        'telegraf.tmpfiles'
-				'telegraf.service')
+        'telegraf.tmpfiles')
 md5sums=('SKIP'
          'd552ccaa62f0e839281641d07ebd397e'
          '58cc9edf8fbf07e7d3a0357db78121b1'
-         '9c7a4df3556cab94837c432f5e46cf04'
-         'cd4d39cec1edf54ab2aa4b7599c81ecc')
+         '9c7a4df3556cab94837c432f5e46cf04')
 
 build()
 {
   export GOPATH="$srcdir"
-  export PATH="$GOPATH/bin:$PATH"
+  export GOBIN="$GOPATH/bin"
+  export PATH="$GOBIN:$PATH"
   mkdir -p "$GOPATH/src/github.com/influxdata"
   mv -f "$srcdir/telegraf" "$GOPATH/src/github.com/influxdata/"
 
@@ -46,13 +45,12 @@ 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"
-  install -Dm644 telegraf.service "$pkgdir/usr/lib/systemd/system/telegraf.service"
 
-  cd $GOPATH
-  install -Dsm755 bin/telegraf "$pkgdir/usr/bin/telegraf"
+  cd $GOBIN
+  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 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"