[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-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



Title: GitLab

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:

Changes:

  • projects/release/build
    ... ... @@ -51,7 +51,7 @@ RewriteRule ^sha256sums.incrementals.txt.asc$ sha256sums-unsigned-build.incremen
    51 51
     EOF
    
    52 52
     
    
    53 53
     # empty any existing sh256sums file
    
    54
    -echo > sha256sums-unsigned-build.txt
    
    54
    +echo -n > sha256sums-unsigned-build.txt
    
    55 55
     # concat sha256sum entry for each file in set
    
    56 56
     for i in $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip *.tar.gz *.apk *.json | grep -v '\.incremental\.mar$' | sort)
    
    57 57
     do
    

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

  • _______________________________________________
    tor-commits mailing list
    tor-commits@xxxxxxxxxxxxxxxxxxxx
    https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits