Moved signature validation to build() function

2 files changed, 6 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index aa18a3ecfd17..51c67f5dc19d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Wed Nov  8 00:55:53 UTC 2017
+# Wed Nov  8 01:40:38 UTC 2017
 pkgbase = signal-desktop
 	pkgdesc = Private messaging from your desktop
 	pkgver = 1.0.36
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/WhisperSystems/Signal-Desktop
 	arch = any
 	license = GPL3
diff --git a/PKGBUILD b/PKGBUILD
index 45636d316258..7ffc4ad0c979 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=signal-desktop
 pkgver=1.0.36
-pkgrel=2
+pkgrel=3
 pkgdesc='Private messaging from your desktop'
 _basename=Signal-Desktop
 license=('GPL3')
@@ -17,14 +17,11 @@ sha256sums=('SKIP'
             'e99f7af8a3dbb631485bc513b82d44bfe0826cf8a29868f601e285fd4bf48a42'
             '39509f44492374c830c9d9f305b2d528cde905bb7b2c9aeaa74d1c1b23bd371f')
 
-prepare() {
-  msg2 "Verifying signature..."
+build() {
+  msg2 "Verifying developer signature..."
   cd ${_basename}
   _key_id=$(git verify-tag -v v${pkgver} 2>&1|grep 'gpg.*using.*key'|awk '{print $NF}')
-  grep "\"key_id\": \"$_key_id\"" $srcdir/gpg_keys
-}
-
-build() {
+  grep -q "\"key_id\": \"$_key_id\"" $srcdir/gpg_keys
   cd $srcdir/${_basename}
   yarn install |grep -Ev 'bin-mac|bin-win'
   yarn pack-prod