summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD36
2 files changed, 36 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4cd6a5c463a1..d030231e01c8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,21 @@
-# Generated by mksrcinfo v8
-# Mon Mar 27 08:38:31 UTC 2017
pkgbase = nodejs-tldr-git
pkgdesc = Simplified and community-driven man pages (git version)
- pkgver = r2169.7549db27
+ pkgver = r6279.178e6959a
pkgrel = 1
url = https://github.com/tldr-pages/tldr
install = INSTALL
arch = any
license = MIT
makedepends = git
+ makedepends = jq
+ makedepends = npm
depends = nodejs
- depends = npm
conflicts = nodejs-tldr
+ conflicts = tldr
+ replaces = nodejs-tldr
+ replaces = tldr
source = tldr::git+https://github.com/tldr-pages/tldr.git
- sha256sums = SKIP
+ sha1sums = SKIP
pkgname = nodejs-tldr-git
diff --git a/PKGBUILD b/PKGBUILD
index 1a892785211e..2d4535162f3c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,50 @@
# Maintainer: FadeMind <fademind@gmail.com>
+# Contributor: Ivan Fonseca <ivanfon[at]riseup[dot]net>
# Contributor: John D Jones III jnbek1972 __AT__ $mailservice_by_google __DOT__ com
+_npmname=tldr
pkgname=nodejs-tldr-git
-pkgver=r2169.7549db27
+pkgver=r6279.178e6959a
pkgrel=1
pkgdesc="Simplified and community-driven man pages (git version)"
arch=('any')
url="https://github.com/tldr-pages/tldr"
license=('MIT')
-makedepends=('git')
-depends=('nodejs' 'npm')
-conflicts=('nodejs-tldr')
+makedepends=('git' 'jq' 'npm')
+depends=('nodejs' )
+conflicts=('nodejs-tldr' 'tldr')
+replaces=('nodejs-tldr' 'tldr')
install='INSTALL'
source=("tldr::git+${url}.git")
-sha256sums=('SKIP')
+sha1sums=('SKIP')
pkgver(){
- cd tldr
+ cd "${_npmname}"
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
}
+# see: https://wiki.archlinux.org/index.php/Node.js_package_guidelines
+
package() {
local _npmdir="${pkgdir}/usr/lib/node_modules/"
mkdir -p ${_npmdir}
cd ${_npmdir}
- npm install -g --prefix "${pkgdir}/usr" tldr
+ npm install -g --prefix "${pkgdir}/usr" "${_npmname}"
+
+ # 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 {} +
+
+ # npm gives ownership of ALL FILES to build user
+ # https://bugs.archlinux.org/task/63396
+ chown -R root:root "$pkgdir"
+
+ # Remove local paths from package.json
+ find "$pkgdir" -name package.json -print0 | xargs -r -0 sed -i '/_where/d'
+ 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"
}
+