boklm pushed to branch main at The Tor Project / Applications / tor-browser-build

Commits: 7f1fcca6 by Nicolas Vigier at 2023-01-23T17:46:39+01:00 Bug 40747: Remove empty line at the top of sha256sums-unsigned-build.txt

- - - - - 80d457f7 by Nicolas Vigier at 2023-01-23T17:46:42+01:00 Bug 40748: Remove warning in dmg2mar when sha256sums-unsigned-build.txt contains an empty line

- - - - -

2 changed files:

- projects/release/build - tools/dmg2mar

Changes:

===================================== projects/release/build ===================================== @@ -51,7 +51,7 @@ RewriteRule ^sha256sums.incrementals.txt.asc$ sha256sums-unsigned-build.incremen EOF

# empty any existing sh256sums file -echo > sha256sums-unsigned-build.txt +echo -n > sha256sums-unsigned-build.txt # concat sha256sum entry for each file in set for i in $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip *.tar.gz *.apk *.json | grep -v '.incremental.mar$' | sort) do

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

View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/1...