summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDrew Noel2018-10-11 15:10:26 -0500
committerDrew Noel2018-10-11 15:15:14 -0500
commit4f6625654d0850ca18f75b595f61c4c11a23a0b5 (patch)
treeabe994f618e71b05692ee3484636e92c4992fb9c
parent72e1b8e20d764b0ef218dc699553be7efa81b7dc (diff)
downloadaur-4f6625654d0850ca18f75b595f61c4c11a23a0b5.tar.gz
Clean up cache and remove refs to src/pkg
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD26
2 files changed, 21 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2b685a65077..770189b8620 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -3,12 +3,12 @@
pkgbase = nodejs-nativefier
pkgdesc = Wrap web apps natively
pkgver = 7.6.8
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/jiahaog/nativefier#readme
arch = any
+ makedepends = jq
+ makedepends = npm
depends = nodejs
- depends = npm
- noextract = nativefier-7.6.8.tgz
source = http://registry.npmjs.org/nativefier/-/nativefier-7.6.8.tgz
sha1sums = 0d3a6a8249dfd721630eb26ddec58dd7f4abfb6b
diff --git a/PKGBUILD b/PKGBUILD
index 03b21a5a6e7..4805fe29332 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,23 +2,33 @@ _npmname=nativefier
_npmver=7.6.8
pkgname=nodejs-nativefier
pkgver=7.6.8
-pkgrel=1
+pkgrel=2
pkgdesc="Wrap web apps natively"
arch=(any)
url="https://github.com/jiahaog/nativefier#readme"
license=()
-depends=('nodejs' 'npm' )
+depends=('nodejs')
+makedepends=('jq' 'npm')
optdepends=()
source=(http://registry.npmjs.org/$_npmname/-/$_npmname-$_npmver.tgz)
-noextract=($_npmname-$_npmver.tgz)
sha1sums=('0d3a6a8249dfd721630eb26ddec58dd7f4abfb6b')
package() {
- cd $srcdir
- local _npmdir="$pkgdir/usr/lib/node_modules/"
- mkdir -p $_npmdir
- cd $_npmdir
- npm install -g --prefix "$pkgdir/usr" $_npmname@$_npmver
+ # Thanks jeremejevs and je-vv for the pointers on these!
+ npm install -g --user root --cache "${srcdir}/npm-cache" --prefix "$pkgdir/usr" "$srcdir/$_npmname-$pkgver.tgz"
+
+ # Fix permissions
+ find "$pkgdir"/usr -type d -exec chmod 755 {} +
+
+ # 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/$_npmname/package.json"
+ jq '.|=with_entries(select(.key|test("_.+")|not))' "$pkgjson" > "$tmppackage"
+ mv "$tmppackage" "$pkgjson"
+ chmod 644 "$pkgjson"
}
# vim:set ts=2 sw=2 et: