Update and patch errors

1 files changed, 27 insertions, 12 deletions

diff --git a/PKGBUILD b/PKGBUILD
index d13d05fed6db..edb37aaa81ae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
-# Maintainer: Daniel M. Capella <polyzen@archlinux.org>
+# Maintainer: Chris Icenhour <chris@randomlinux.com>
+# Contributor: Daniel M. Capella <polyzen@archlinux.org>
 
 pkgname=coinmon
-pkgver=0.0.22
+pkgver=0.0.24
 pkgrel=1
 pkgdesc='Cryptocurrency price monitoring tool'
 arch=('any')
@@ -9,19 +10,33 @@ url=https://github.com/bichenkk/coinmon
 license=('MIT')
 depends=('nodejs')
 makedepends=('npm')
-source=("https://registry.npmjs.org/coinmon/-/coinmon-$pkgver.tgz")
+source=("https://registry.npmjs.org/coinmon/-/coinmon-$pkgver.tgz" "fix_index_js.patch")
 noextract=("${source[@]##*/}")
-sha512sums=('2222f96db8ac9d9e14dc854d9f797967c77546743dcafcd6ba100953956d486a1e61f7429fb8d49658b01f4daf6853928200e432829d87c7a1e8e960aa632eea')
+sha512sums=('a5bff3925c24c99addc50075ce6ea7e3a87e36b1cf5be2f41fc43d8a4a7cbf7d4010b81a66553b73fd00af017ab0009d3039aeadf18fda538ab04367bfbc4dde'
+            '1a6baffb1a0103adb5dd3aea35078b8fbaa40400a3fd44c99d6cf15da9c8f49a1851ff86365e317731074aaef30989b1cd8f03c4235076324de1f43a316b0047')
 
 package() {
   npm install -g --user root --prefix "$pkgdir"/usr --ignore-scripts --production coinmon-$pkgver.tgz
 
-  cd "$pkgdir"
-  mkdir -p usr/share/licenses/coinmon
-  mv usr/lib/node_modules/coinmon/LICENSE usr/share/licenses/coinmon/
-  rm usr/lib/node_modules/coinmon/{.,}* || true
-  chmod 755 usr/bin
-  find usr/lib/node_modules -type d -exec chmod 755 {} +
-}
+  mkdir -p $pkgdir/usr/share/licenses/$pkgname
+  mv $pkgdir/usr/lib/node_modules/$pkgname/LICENSE $pkgdir/usr/share/licenses/$pkgname/
+
+  chown -R root:root "$pkgdir/usr/"
+
+  # Remove references to $pkgdir
+  find "$pkgdir" -type f -name package.json -print0 | xargs -0 sed -i "/_where/d"
 
-# vim:set ts=2 sw=2 et:
+  # Remove unneeded files
+  find $pkgdir/usr/lib/node_modules/coinmon -maxdepth 1 -type f -not -name package.json -delete
+
+  # 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"
+
+  chmod 755 $pkgdir/usr/bin
+  find $pkgdir/usr/lib/node_modules -type d -exec chmod 755 {} +
+  patch -p1 -d "$pkgdir/usr/lib/node_modules/$pkgname/" < $srcdir/fix_index_js.patch
+}