Updated: 6.31.1

2 files changed, 23 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 89c9cf59e172..1fc1caf8f179 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
 pkgbase = elasticdump
 	pkgdesc = Import and export tools for Elasticsearch
-	pkgver = 6.2.2
+	pkgver = 6.31.1
 	pkgrel = 1
 	url = https://github.com/taskrabbit/elasticsearch-dump
 	arch = any
 	license = Apache
 	makedepends = npm
 	depends = nodejs>=8.0
-	noextract = elasticdump-6.2.2.tgz
-	source = http://registry.npmjs.org/elasticdump/-/elasticdump-6.2.2.tgz
-	sha256sums = 04ab7525b4b5e104ff37b1771483705e13b46c97a98c064d6cfada5a4829cedd
+	noextract = elasticdump-6.31.1.tgz
+	source = http://registry.npmjs.org/elasticdump/-/elasticdump-6.31.1.tgz
+	sha256sums = 4c4e7f45ef251acc005d3de0a99acfb2b09152c0a62f10fe51e6e043ba97f6f6
 
 pkgname = elasticdump
 
diff --git a/PKGBUILD b/PKGBUILD
index 10eecfcbe1e1..e0eb5edb9ba5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,10 @@
+# Maintainer: Felix Golatofski <contact@xdfr.de>
 # Contributor: Johannes Dewender  arch at JonnyJD dot net
 # Contributor: Vlad M. <vlad@archlinux.net>
 # Contributor: Timofey Titovets <nefelim4ag@gmail.com>
 
 pkgname=elasticdump
-pkgver=6.2.2
+pkgver=6.31.1
 pkgrel=1
 pkgdesc="Import and export tools for Elasticsearch"
 arch=(any)
@@ -12,24 +13,27 @@ license=("Apache")
 depends=('nodejs>=8.0')
 makedepends=('npm')
 source=("http://registry.npmjs.org/${pkgname}/-/${pkgname}-${pkgver}.tgz")
-sha256sums=('04ab7525b4b5e104ff37b1771483705e13b46c97a98c064d6cfada5a4829cedd')
+sha256sums=('4c4e7f45ef251acc005d3de0a99acfb2b09152c0a62f10fe51e6e043ba97f6f6')
 noextract=("$pkgname-$pkgver.tgz")
 
 package() {
-  npm install -g --user root --prefix "${pkgdir}/usr" "$srcdir/$pkgname-$pkgver.tgz"
+    # Thanks jeremejevs and je-vv for the pointers on these!
+    npm install -g --user root --cache "${srcdir}/npm-cache" --prefix "$pkgdir/usr" "$srcdir/$pkgname-$pkgver.tgz"
 
-  BASE_PATH="${pkgdir}/usr/lib/node_modules/elasticdump"
-  TRASH=(
-    "$BASE_PATH"/.{idea,github}
-    "$BASE_PATH"/node_modules/lossless-json/.idea
-    "$BASE_PATH"/node_modules/aws-sdk/.changes
-  )
+    # Fix permissions
+    find "$pkgdir"/usr -type d -exec chmod 755 {} +
 
-  # Cleanup
-  for path in "${TRASH[@]}"; do
-      [ -d "$path" ] && rm -r "$path"
-  done
+    # npm gives ownership of ALL FILES to build user
+    # https://bugs.archlinux.org/task/63396
+    chown -R root:root "${pkgdir}"
 
-  find "$BASE_PATH" -type f -name ".*" -delete
-  find "$BASE_PATH" -empty -delete
+    # Remove references to pkgdir
+    find "$pkgdir" -type f -name package.json -print0 | xargs -0 sed -i "/_where/d"
+
+    # Remove references to srcdir
+    local tmppackage="$(mktemp)"
+    local pkgjson="$pkgdir/usr/lib/node_modules/$pkgname/package.json"
+    jq '.|=with_entries(select(.key|test("_.+")|not))' "$pkgjson" > "$tmppackage"
+    mv "$tmppackage" "$pkgjson"
+    chmod 644 "$pkgjson"
 }