Add version 2.4.1 (intial commit)

2 files changed, 11 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c40c41f2a838..a187cfe44675 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -5,9 +5,9 @@ pkgbase = nodejs-wintersmith
 	url = https://wintersmith.io
 	arch = any
 	license = MIT
+	makedepends = npm
 	depends = nodejs
-	depends = npm
-	noextract = wintersmith-.tgz
+	noextract = wintersmith-2.4.1.tgz
 	source = https://registry.npmjs.org/wintersmith/-/wintersmith-2.4.1.tgz
 	sha256sums = d6c6116cf36550c4f691c40258e68ab006a357c6afe9e29fa774adad7e5c2267
 
diff --git a/PKGBUILD b/PKGBUILD
index 90dfb93db758..31b78164583d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,16 +8,18 @@ pkgdesc="A flexible static site generator."
 arch=('any')
 url="https://wintersmith.io"
 license=('MIT')
-depends=('nodejs' 'npm')
+depends=('nodejs')
+makedepends=('npm')
 source=(https://registry.npmjs.org/$_npmname/-/$_npmname-$pkgver.tgz)
-noextract=($_npmname-$_pkgver.tgz)
+noextract=($_npmname-$pkgver.tgz)
 sha256sums=('d6c6116cf36550c4f691c40258e68ab006a357c6afe9e29fa774adad7e5c2267')
 
 package() {
-    cd "$srcdir"
-    local _npmdir="$pkgdir/usr/lib/node_modules/"
-    mkdir -p "$_npmdir"
-    cd "$_npmdir"
-    npm install --user root -g --prefix "$pkgdir/usr" $_npmname@$_pkgver
+    npm install -g --production --user root --prefix "$pkgdir/usr" "$_npmname-$pkgver.tgz"
+    rm -r "$pkgdir/usr/etc/"
+
+    # Non-deterministic race in npm gives 777 permissions to random directories.
+    # See https://github.com/npm/npm/issues/9359 for details.
+    find "${pkgdir}"/usr -type d -exec chmod 755 {} +
 }