[tor-commits] [tor-browser-bundle/master] Bug 20704: fix mar files code signing check

[gk at torproject.org]

commit 234b76caf9c9743a43fcd1ff08f6f180ee981b20
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Thu Nov 17 22:53:43 2016 +0100

    Bug 20704: fix mar files code signing check
---
 tools/update-responses/config.yml       | 1 -
 tools/update-responses/update_responses | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml
index 786030d..2e48e2c 100644
--- a/tools/update-responses/config.yml
+++ b/tools/update-responses/config.yml
@@ -3,7 +3,6 @@ appname_marfile: tor-browser
 appname_bundle_osx: TorBrowser
 appname_bundle_linux: tor-browser
 appname_bundle_win: torbrowser-install
-appdir_osx: TorBrowser.app
 releases_dir: ../../gitian
 download:
     archive_url: https://archive.torproject.org/tor-package-archive/torbrowser
diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses
index fd59132..b61e379 100755
--- a/tools/update-responses/update_responses
+++ b/tools/update-responses/update_responses
@@ -200,8 +200,8 @@ sub create_incremental_mar {
     extract_mar(mar_filename($appname, $from_version, $os, $lang), "$tmpdir/A");
     extract_mar(mar_filename($appname, $new_version, $os, $lang), "$tmpdir/B");
     if ($ENV{CHECK_CODESIGNATURE_EXISTS}) {
-        unless (-f "$tmpdir/A/$config->{appdir_osx}/Contents/_CodeSignature/CodeResources"
-            && -f "$tmpdir/B/$config->{appdir_osx}/Contents/_CodeSignature/CodeResources") {
+        unless (-f "$tmpdir/A/Contents/_CodeSignature/CodeResources"
+            && -f "$tmpdir/B/Contents/_CodeSignature/CodeResources") {
             exit_error "Missing code signature while creating $mar_file";
         }
     }