upgpkg: eleventy 0.11.1-1

npm install --user root is wrong

2 files changed, 7 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 214af6e2ffe9..6710670f15b9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -6,7 +6,6 @@ pkgbase = eleventy
 	arch = any
 	license = MIT
 	makedepends = npm
-	makedepends = jq
 	depends = nodejs
 	noextract = eleventy-0.11.1.tar.gz
 	source = eleventy-0.11.1.tar.gz::https://github.com/11ty/eleventy/archive/v0.11.1.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index 101a13658f5f..23c0468b9380 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
-# Maintainer:  Dimitris Kiziridis <ragouel at outlook dot com>
+# Maintainer: sohlk <sohlk at outlook dot com>
+# Contributor:  Dimitris Kiziridis <ragouel at outlook dot com>
 
 pkgname=eleventy
 pkgver=0.11.1
@@ -8,21 +9,13 @@ arch=('any')
 url='https://www.11ty.dev'
 license=('MIT')
 depends=('nodejs')
-makedepends=('npm' 'jq')
-noextract=("${pkgname}-${pkgver}.tar.gz")
+makedepends=('npm')
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/11ty/eleventy/archive/v${pkgver}.tar.gz")
+noextract=("${pkgname}-${pkgver}.tar.gz")
 sha256sums=('da3b11bf638982822befcde468da16a3fe0db2c86ca00ac61b09504976e4a6af')
 
 package() {
-  npm install -g --user root --prefix "${pkgdir}/usr" "${srcdir}/${pkgname}-${pkgver}.tar.gz"
-  find "$pkgdir" -name package.json -print0 | xargs -r -0 sed -i '/_where/d'
-  local tmppackage="$(mktemp)"
-  local pkgjson="$pkgdir/usr/lib/node_modules/@11ty/eleventy/package.json"
-  jq '.|=with_entries(select(.key|test("_.+")|not))' "$pkgjson" > "$tmppackage"
-  mv "$tmppackage" "$pkgjson"
-  chmod 644 "$pkgjson"
-  find "${pkgdir}/usr" -type d -exec chmod 755 {} +
-  chown -R root:root "${pkgdir}" 
-  install -Dm644 "${pkgdir}/usr/lib/node_modules/@11ty/eleventy/LICENSE" \
-   -t "${pkgdir}/usr/share/licenses/${pkgname}"
+  npm install -g --production --prefix "${pkgdir}/usr" "${srcdir}/${pkgname}-${pkgver}.tar.gz"
+  chown -R root:root "${pkgdir}"
+  install -Dm644 -t "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgdir}/usr/lib/node_modules/@11ty/eleventy/LICENSE"
 }