got verification to work when sig is valid

diff --git a/torbrowser-launcher b/torbrowser-launcher
index 32a05ed58fb83a7d6b26e300120dc9f2264a2f0f..07094054cfa17590d5b6e9c676ca5313f66d9d43 100755 (executable)
--- a/torbrowser-launcher
+++ b/torbrowser-launcher
@@ -266,11 +266,15 @@ class TorBrowserLauncher:
     return True
 
   def verify(self):
-    verify_output = subprocess.check_output([self.paths['file']['verify']])
+    error = False
+
+    verify_output = subprocess.check_output([self.paths['file']['verify'], self.paths['dir']['gpg'], self.paths['file']['tarball_sig']], stderr=subprocess.STDOUT)
     if 'Good signature' in verify_output:
       self.run_task();
-
     else:
+      error = True
+
+    if error:
       self.label = "Signature verification failed!"
 
   def extract(self):

diff --git a/verify.sh b/verify.sh
index fb444d1aa5c3577d569cf58d64708b7685001c47..dde70d0901c02aff8e86c523010992b630b33e58 100755 (executable)
--- a/verify.sh
+++ b/verify.sh
@@ -12,5 +12,5 @@ chmod 700 $GPG_TMP_DIR
 # import erinn's public key
 gpg --homedir $GPG_TMP_DIR --import /usr/share/torbrowser-launcher/erinn.asc
 
-#verify the signature
+# verify the signature
 gpg --homedir $GPG_TMP_DIR --verify $TBB_SIG