[tbb-commits] [Git][tpo/applications/tor-browser-build][maint-12.0] 2 commits: Bug 40747: Remove empty line at the top of sha256sums-unsigned-build.txt

[boklm (@boklm)]

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


Commits:
76ea72c2 by Nicolas Vigier at 2023-01-23T17:47:56+01:00
Bug 40747: Remove empty line at the top of sha256sums-unsigned-build.txt

- - - - -
6c1adab8 by Nicolas Vigier at 2023-01-23T17:48:08+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/98053ed8d40c910ec73fc755c896c1f35569aeca...6c1adab8eaedad7453016ae53609c6e8169c3844

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/98053ed8d40c910ec73fc755c896c1f35569aeca...6c1adab8eaedad7453016ae53609c6e8169c3844
You're receiving this email because of your account on gitlab.torproject.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tbb-commits/attachments/20230123/d71502d9/attachment-0001.htm>