diff options
author | Caleb Maclennan | 2020-02-19 08:25:58 +0300 |
---|---|---|
committer | Caleb Maclennan | 2020-02-19 08:25:58 +0300 |
commit | a371dad3a2c38db82f9e9ee725cd8034f901acb6 (patch) | |
tree | 3d5525a0985273d45229576d0c857c832d1b94d1 | |
parent | e3344003ea288f1a82ebb4cfdda8c54858575375 (diff) | |
download | aur-a371dad3a2c38db82f9e9ee725cd8034f901acb6.tar.gz |
Fix recursive srcdir path removal
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | PKGBUILD | 7 |
2 files changed, 7 insertions, 4 deletions
@@ -1,11 +1,13 @@ pkgbase = nodejs-jsonlint pkgdesc = Validate JSON pkgver = 1.6.3 - pkgrel = 4 + pkgrel = 5 url = https://zaa.ch/jsonlint}/ arch = any license = MIT makedepends = npm + makedepends = jq + makedepends = moreutils depends = nodejs noextract = jsonlint-1.6.3.tgz source = https://registry.npmjs.org/jsonlint/-/jsonlint-1.6.3.tgz @@ -5,13 +5,13 @@ _npmname=jsonlint pkgname=nodejs-"$_npmname" pkgver=1.6.3 -pkgrel=4 +pkgrel=5 pkgdesc='Validate JSON' arch=('any') url="https://zaa.ch/$_npmname}/" license=('MIT') depends=('nodejs') -makedepends=('npm') +makedepends=('npm' 'jq' 'moreutils') source=("https://registry.npmjs.org/$_npmname/-/$_npmname-$pkgver.tgz") sha256sums=('987f42f0754b7bc0c84967b81fc2b4db0ed2ebe2117ccc5a5faa59e462447723') noextract=("${source[@]##*/}") @@ -19,6 +19,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" } |