summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLocutus2019-11-08 21:42:28 +0200
committerLocutus2019-11-08 21:42:28 +0200
commit9e165cf11ff5193c312c9ebd7e48d4a4a9d316c6 (patch)
treeb687dcd6b7305857f89fc77e780d0a734e5c5d07
parentdc025467cc38d4a724bb593b9ffd4e866b2937f2 (diff)
downloadaur-9e165cf11ff5193c312c9ebd7e48d4a4a9d316c6.tar.gz
Updated to 2.3.1
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD38
2 files changed, 27 insertions, 21 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 14af709479c8..3a5e90e28da2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
pkgbase = cloudron-cli
pkgdesc = Cloudron Commandline Tool
- pkgver = 2.0.2
+ pkgver = 2.3.1
pkgrel = 1
url = https://git.cloudron.io/cloudron/cloudron-cli
arch = any
license = MIT
+ makedepends = npm
depends = nodejs
- depends = npm
- noextract = cloudron-2.0.2.tgz
- source = http://registry.npmjs.org/cloudron/-/cloudron-2.0.2.tgz
- sha1sums = c97349bc60414007245d8b2bc9a54c673c81eaaf
+ noextract = cloudron-2.3.1.tgz
+ source = http://registry.npmjs.org/cloudron/-/cloudron-2.3.1.tgz
+ sha256sums = 546d4a828f8ec3844bc09b0b7b7ad719c25c4037f1d82db6cfc042758479c0f1
pkgname = cloudron-cli
diff --git a/PKGBUILD b/PKGBUILD
index 7ece229e1d48..67c64c6293ea 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,26 +2,32 @@
# Contributor: Tobias Brunner <tobias@tobru.ch>
_npmname=cloudron
-_npmver=2.0.2
-pkgname=cloudron-cli # All lowercase
-pkgver=2.0.2
+_npmver=2.3.1
+pkgname=cloudron-cli
+pkgver=$_npmver
pkgrel=1
pkgdesc="Cloudron Commandline Tool"
-arch=(any)
+arch=('any')
url="https://git.cloudron.io/cloudron/cloudron-cli"
-license=(MIT)
-depends=('nodejs' 'npm' )
+license=('MIT')
+depends=('nodejs')
+makedepends=('npm' 'jq')
optdepends=()
-source=(http://registry.npmjs.org/$_npmname/-/$_npmname-$_npmver.tgz)
-noextract=($_npmname-$_npmver.tgz)
-sha1sums=(c97349bc60414007245d8b2bc9a54c673c81eaaf)
+source=("http://registry.npmjs.org/$_npmname/-/$_npmname-$_npmver.tgz")
+noextract=("$_npmname-$_npmver.tgz")
+sha256sums=('546d4a828f8ec3844bc09b0b7b7ad719c25c4037f1d82db6cfc042758479c0f1')
package() {
- cd $srcdir
- local _npmdir="$pkgdir/usr/lib/node_modules/"
- mkdir -p $_npmdir
- cd $_npmdir
- npm install -g --prefix "$pkgdir/usr" $_npmname@$_npmver
-}
+ npm install -g --user root --prefix "$pkgdir/usr" "$srcdir/$_npmname-$pkgver.tgz"
+ find "$pkgdir/usr" -type d -exec chmod 755 {} +
+
+ # Remove references to $pkgdir
+ find "$pkgdir" -type f -name package.json -print0 | xargs -0 sed -i "/_where/d"
-# vim:set ts=2 sw=2 et:
+ # Remove references to $srcdir
+ 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"
+}