pkgbuild: enhance pkgbuild

2 files changed, 17 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 496c3ea76cd8..ad3fafad5a4e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -8,6 +8,8 @@ pkgbase = franz
 	license = Apache
 	makedepends = npm
 	makedepends = python2
+	makedepends = git
+	makedepends = hunspell
 	depends = nodejs
 	depends = libx11
 	depends = libxkbfile
@@ -18,8 +20,7 @@ pkgbase = franz
 	depends = alsa-lib
 	depends = nss
 	depends = libxtst
-	depends = nodejs-nan
-	source = https://github.com/meetfranz/franz/archive/v5.0.0-beta.18.tar.gz
+	source = franz-5.0.0_beta.18.tar.gz::https://github.com/meetfranz/franz/archive/v5.0.0-beta.18.tar.gz
 	source = franz.desktop
 	sha256sums = 24768724ea51cc27ccb16997151f0f012c5dd4198ecf32b29826165ef294f2a2
 	sha256sums = 79813a0f7db258fc7c4969cc20b412771530865bec36c0a4b9e18a2e435d97b8
diff --git a/PKGBUILD b/PKGBUILD
index ecbd55d589b2..46697cd9e443 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
 # Maintainer: Filipe Laíns (FFY00) <lains@archlinux.org>
+# Contributor: Giovanni 'ItachiSan' Santini <giovannisantini93@yahoo.it>
 # Contributor: Pieter Goetschalckx <3.14.e.ter <at> gmail <dot> com>
 
 pkgname=franz
@@ -9,19 +10,25 @@ pkgdesc="Free messaging app for services like WhatsApp, Slack, Messenger and man
 arch=('i686' 'x86_64')
 url="https://meetfranz.com"
 license=('Apache')
-depends=('nodejs' 'libx11' 'libxkbfile' 'libxext' 'libxss' 'gconf' 'gtk2' 'alsa-lib' 'nss' 'libxtst' 'nodejs-nan')
-makedepends=('npm' 'python2')
-source=("https://github.com/meetfranz/$pkgname/archive/v$_pkgver.tar.gz"
-	'franz.desktop')
+depends=('nodejs' 'libx11' 'libxkbfile' 'libxext' 'libxss' 'gconf' 'gtk2' 'alsa-lib' 'nss' 'libxtst')
+makedepends=('npm' 'python2' 'git' 'hunspell')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/meetfranz/$pkgname/archive/v$_pkgver.tar.gz"
+        'franz.desktop')
 sha256sums=('24768724ea51cc27ccb16997151f0f012c5dd4198ecf32b29826165ef294f2a2'
-	    '79813a0f7db258fc7c4969cc20b412771530865bec36c0a4b9e18a2e435d97b8')
+            '79813a0f7db258fc7c4969cc20b412771530865bec36c0a4b9e18a2e435d97b8')
 
 build() {
   cd $pkgname-$_pkgver
+
   npm install --production --non-interactive
   npm add electron-builder gulpjs/gulp#4.0
-  node_modules/.bin/gulp build
-  node_modules/.bin/electron-builder --linux dir
+
+  # Better configuration for npm cache and calling installed binaries
+  export npm_config_cache="$srcdir"/npm_cache
+  export PATH="$srcdir"/$pkgname-$_pkgver/node_modules/.bin:$PATH
+
+  gulp build
+  electron-builder --linux dir
 }
 
 package() {