[arch-commits] Commit in beats/trunk (PKGBUILD)

[Massimiliano Torromeo]

    Date: Wednesday, January 30, 2019 @ 20:31:06
  Author: mtorromeo
Revision: 428670

upgpkg: beats 6.6.0-1

Modified:
  beats/trunk/PKGBUILD

----------+
 PKGBUILD |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-01-30 20:28:17 UTC (rev 428669)
+++ PKGBUILD	2019-01-30 20:31:06 UTC (rev 428670)
@@ -3,7 +3,7 @@
 
 pkgbase=beats
 pkgname=(filebeat packetbeat metricbeat heartbeat-elastic auditbeat journalbeat)
-pkgver=6.5.4
+pkgver=6.6.0
 pkgrel=1
 pkgdesc='Data shippers for Elasticsearch'
 arch=('x86_64')
@@ -23,7 +23,7 @@
         "auditbeat.service"
         "journalbeat.service"
         "tmpfile.conf")
-sha256sums=('4f16f09bc1904cd6c8d864addb3694a041adddb8bd7fa767d6ea8dbd570385d9'
+sha256sums=('0e55beab8945ba4c8035afcd22ae263d2c955dfc47e420d5231780ab53391342'
             '75583a195b43d7345449bbac60359bf54661ccbd699386a6e59bb483c6054338'
             '33feb3690f8b31563cc1e2da557c2aa326501ce9ccd7e0a142036902bfdb05ff'
             '4d5394cfe3299c9a6af5ac34c1ad4bcdc2e79162379cccbf00fb414eb28253c0'
@@ -59,8 +59,7 @@
 
     # Workaround to place extracted release into GOPATH
     mkdir -p "$GOPATH"/src/github.com/elastic
-    ln -sf "$srcdir"/beats-$pkgver \
-        "$GOPATH"/src/github.com/elastic/beats
+    ln -sf ../../../../beats-$pkgver "$GOPATH"/src/github.com/elastic/beats
 }
 
 build() {
@@ -80,7 +79,7 @@
         make
         make fields
 
-        if [ ! -d _meta/kibana ]; then
+        if grep -Eq '^kibana:' Makefile; then
             make kibana
             mv _meta/kibana{.generated,}
         fi
@@ -110,7 +109,9 @@
 
     sed "s/BEATNAME/$_pkgname/g" "$srcdir"/tmpfile.conf > "$pkgdir"/usr/lib/tmpfiles.d/$_pkgname.conf
 
-    cp -R _meta/kibana "$pkgdir"/usr/share/$_pkgname/
+    if [ -d _meta/kibana ]; then
+        cp -R _meta/kibana "$pkgdir"/usr/share/$_pkgname/
+    fi
 
     if [ -d module ]; then
         cp -R module "$pkgdir"/usr/share/$_pkgname/