commit 1633185de3336351f47cb66b99903ef70b04d6ff Author: Nicolas Vigier boklm@torproject.org Date: Mon Jun 25 14:41:39 2018 +0200

Bug 26489: fix .app directory name in tools/dmg2mar

Add the whitespace in "Tor Browser.app". --- tools/dmg2mar | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tools/dmg2mar b/tools/dmg2mar index 51d6acb..9b98956 100755 --- a/tools/dmg2mar +++ b/tools/dmg2mar @@ -36,9 +36,10 @@ use Parallel::ForkManager; use Cwd;

# If the application is not TorBrowser (for instance, TorMessenger) -# set the application name in the TOR_APPNAME_BUNDLE_OSX and in -# the TOR_APPNAME_MARFILE environment variables -my $appname = $ENV{TOR_APPNAME_BUNDLE_OSX} // 'TorBrowser'; +# set the application name in the TOR_APPNAME_BUNDLE_OSX, +# TOR_APPNAME_DMGFILE and TOR_APPNAME_MARFILE environment variables +my $appname = $ENV{TOR_APPNAME_BUNDLE_OSX} // 'Tor Browser'; +my $appname_dmg = $ENV{TOR_APPNAME_DMGFILE} // 'TorBrowser'; my $appname_mar = $ENV{TOR_APPNAME_MARFILE} // 'tor-browser';

sub exit_error { @@ -95,7 +96,7 @@ sub get_dmg_files_from_sha256sums { foreach my $line (read_file('sha256sums-unsigned-build.txt')) { my (undef, $filename) = split ' ', $line; chomp $filename; - next unless $filename =~ m/^$appname-(.+)-osx64_(.+).dmg$/; + next unless $filename =~ m/^$appname_dmg-(.+)-osx64_(.+).dmg$/; push @files, { filename => $filename, version => $1, lang => $2 }; } return @files;