Update deps; download source; install readme, license

2 files changed, 24 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3de13cd63a8e..da22c9556e31 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,24 @@
 pkgbase = stf
 	pkgdesc = Web application for controlling and managing Android devices
 	pkgver = 3.4.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://openstf.io
 	arch = i686
 	arch = x86_64
 	license = Apache
 	makedepends = npm
-	depends = nodejs
+	makedepends = python2
+	makedepends = graphicsmagick
+	makedepends = protobuf
+	makedepends = yasm
 	depends = android-tools
+	depends = nodejs<10
 	depends = rethinkdb
-	depends = graphicsmagick
 	depends = zeromq
-	depends = protobuf
-	depends = yasm
-	depends = pkg-config
+	noextract = stf-3.4.1.tgz
 	options = !strip
+	source = https://registry.npmjs.org/stf/-/stf-3.4.1.tgz
+	sha512sums = 75dca7e86a16a1ba12cded9249130a8c31aee22d33d71690d0a3790624089c0c9eb885c6899ca0641c5e26c3b4d86ad027cf2b09be62f49491faa330c81cfa07
 
 pkgname = stf
 
diff --git a/PKGBUILD b/PKGBUILD
index 0d15127869aa..3637c5ce34dc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,23 +2,26 @@
 
 pkgname=stf
 pkgver=3.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Web application for controlling and managing Android devices'
 arch=(i686 x86_64)
 url=https://openstf.io
 license=(Apache)
-depends=(nodejs
-         android-tools
-         rethinkdb
-         graphicsmagick
-         zeromq
-         protobuf
-         yasm
-         pkg-config)
-makedepends=(npm)
+depends=(android-tools 'nodejs<10' rethinkdb zeromq)
+makedepends=(npm python2 graphicsmagick protobuf yasm)
 options=(!strip)
+source=(https://registry.npmjs.org/stf/-/stf-$pkgver.tgz)
+noextract=(stf-$pkgver.tgz)
+sha512sums=('75dca7e86a16a1ba12cded9249130a8c31aee22d33d71690d0a3790624089c0c9eb885c6899ca0641c5e26c3b4d86ad027cf2b09be62f49491faa330c81cfa07')
 
 package() {
-  npm i -g --prefix="$pkgdir"/usr stf@$pkgver
-  find "$pkgdir"/usr -type d -exec chmod 755 {} +
+  npm i -g --prefix="$pkgdir"/usr $pkgname-$pkgver.tgz
+
+  cd "$pkgdir"/usr
+
+  # Remove world-writeable bits
+  find . -type d -exec chmod 755 {} +
+
+  install -Dm 644 lib/node_modules/stf/README.md -t share/doc/stf
+  install -Dm 644 lib/node_modules/stf/LICENSE -t share/licenses/stf
 }