dmg2mar script is broken due to added whitespace in "Tor Browser"
We need to adapt our dmg2mar
script to take care of the additional whitespace in "Tor Browser". boklm gave me a patch to test
diff --git a/tools/dmg2mar b/tools/dmg2mar
index 51d6acb..05d54a8 100755
--- a/tools/dmg2mar
+++ b/tools/dmg2mar
@@ -38,7 +38,8 @@ 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';
+my $appname = $ENV{TOR_APPNAME_BUNDLE_OSX} // 'Tor Browser';
+my $appname_dmg = '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;
which seems to do things for now as a workaround to unbreak the signing.