summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaleb Maclennan2020-02-19 08:34:32 +0300
committerCaleb Maclennan2020-02-19 08:34:32 +0300
commit613109bdfb0edeb20118781f357977f2fbdc0192 (patch)
tree42e139b2fca69b306c0dc73de7167be58cbc8471
parent6bedfbbe77d20dffa1f0822ebbc1c80aff96e9c1 (diff)
downloadaur-613109bdfb0edeb20118781f357977f2fbdc0192.tar.gz
Fix recursive srcdir path removal
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD7
2 files changed, 7 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a4644fb57c60..79107081f5c7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,13 @@
pkgbase = nodejs-jshint
pkgdesc = Static analysis tool for JavaScript
pkgver = 2.11.0
- pkgrel = 5
+ pkgrel = 6
url = https://jshint.com/
arch = any
license = MIT
makedepends = npm
+ makedepends = jq
+ makedepends = moreutils
depends = nodejs
noextract = jshint-2.11.0.tgz
source = https://registry.npmjs.org/jshint/-/jshint-2.11.0.tgz
diff --git a/PKGBUILD b/PKGBUILD
index 109e2762f9a5..dd267291c6d7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,13 +4,13 @@
_npmname=jshint
pkgname=nodejs-"$_npmname"
pkgver=2.11.0
-pkgrel=5
+pkgrel=6
pkgdesc='Static analysis tool for JavaScript'
arch=('any')
url='https://jshint.com/'
license=('MIT')
depends=('nodejs')
-makedepends=('npm')
+makedepends=('npm' 'jq' 'moreutils')
source=("https://registry.npmjs.org/$_npmname/-/$_npmname-$pkgver.tgz")
sha256sums=('1a7fa84101fb2212110a41543e88bca26d3b9762bce63c95627ac0dbdf4d5a3a')
noextract=("${source[@]##*/}")
@@ -18,6 +18,7 @@ noextract=("${source[@]##*/}")
package() {
npm install -g --user root --cache "$srcdir/npm-cache" --prefix "$pkgdir/usr" "${source[@]##*/}"
find "$pkgdir"/usr -type d -exec chmod 755 {} +
- find "$pkgdir" -type f -name package.json -exec sed -i -e "/${pkgdir//\//\\/}/d" -e "/${srcdir//\//\\/}/d" {} \;
+ find "$pkgdir" -type f -name package.json \
+ -execdir sh -c "jq '. |= with_entries(select(.key | test(\"_.+\") | not))' {} | sponge {}" \;
chown -R root:root "$pkgdir"
}