boklm pushed to branch main at The Tor Project / Applications /
tor-browser-build
Commits:
441b2dca by Nicolas Vigier at 2026-05-07T19:11:01+02:00
Bug 41793: Remove workaround in dmg2mar for old versions of 7z
- - - - -
1 changed file:
- tools/dmg2mar
Changes:
=====================================
tools/dmg2mar
=====================================
@@ -114,34 +114,12 @@ sub convert_files {
$file->{filename});
exit_error "Error extracting $file->{filename}: $err" unless $success;
- # 7z does not currently extract file permissions from the dmg files
- # so we also extract the old mar file to copy the permissions
- # https://trac.torproject.org/projects/tor/ticket/20210
- my $tmpdir_oldmar = File::Temp->newdir();
- my $oldmar = getcwd . '/' . $output;
- exit_error "Error extracting $output"
- unless system('mar', '-C', $tmpdir_oldmar, '-x', $oldmar) == 0;
- my $appdir = "$tmpdir/$appname/$appname.app";
- exit_error "Missing directory $appdir" unless -d $appdir;
- my $wanted = sub {
- my $file = $File::Find::name;
- $file =~ s{^$appdir/}{};
- if (-f "$tmpdir_oldmar/$file") {
- my (undef, undef, $mode) = stat("$tmpdir_oldmar/$file");
- chmod $mode, $File::Find::name;
- return;
- }
- chmod 0644, $File::Find::name if -f $File::Find::name;
- chmod 0755, $File::Find::name if -d $File::Find::name;
- };
- find($wanted, $appdir);
-
unlink $output;
local $ENV{MOZ_PRODUCT_VERSION} = $file->{version};
local $ENV{MAR_CHANNEL_ID} = $mar_channel_id;
local $ENV{TMPDIR} = $tmpdir;
(undef, $err, $success) = capture_exec('make_full_update.sh', '-q',
- $output, $appdir);
+ $output,
"$tmpdir/$appname/$appname.app");
exit_error "Error updating $output: $err" unless $success;
exit_error "make_full_update.sh failed. $output was not created.\n$err"
unless -f $output;
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/441b2dca097aba429fcdb91ddfb3b7148e92530c
--
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/441b2dca097aba429fcdb91ddfb3b7148e92530c
You're receiving this email because of your account on gitlab.torproject.org.
Manage all notifications: https://gitlab.torproject.org/-/profile/notifications
| Help: https://gitlab.torproject.org/help
_______________________________________________
tbb-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
