[tbb-commits] [Git][tpo/applications/tor-browser-build][maint-12.5] Bug 40889: Add mullvad sha256sums URL to...

[richard (@richard)]

richard pushed to branch maint-12.5 at The Tor Project / Applications / tor-browser-build


Commits:
8140af32 by Nicolas Vigier at 2023-07-12T13:56:25+00:00
Bug 40889: Add mullvad sha256sums URL to download-unsigned-sha256sums-gpg-signatures-from-people-tpo

- - - - -


2 changed files:

- + keyring/jb.gpg
- tools/signing/download-unsigned-sha256sums-gpg-signatures-from-people-tpo


Changes:

=====================================
keyring/jb.gpg
=====================================
Binary files /dev/null and b/keyring/jb.gpg differ


=====================================
tools/signing/download-unsigned-sha256sums-gpg-signatures-from-people-tpo
=====================================
@@ -3,16 +3,24 @@ set -e
 script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 source "$script_dir/functions"
 
-for builder in $tb_builders
+for builder in $tb_builders jb
 do
-  for file in sha256sums-unsigned-build.txt.asc sha256sums-unsigned-build.incrementals.txt.asc
+  for file in sha256sums-unsigned-build.txt sha256sums-unsigned-build.incrementals.txt
   do
     tmpfile=$(mktemp)
     chmod 644 "$tmpfile"
-    for url in \
-      "https://people.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tbb_version-build$tbb_version_build/$file" \
-      "https://tb-build-04.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tbb_version_type/unsigned/$tbb_version-build$tbb_version_build/$file" \
-      "https://tb-build-05.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tbb_version_type/unsigned/$tbb_version-build$tbb_version_build/$file"
+    if test "$builder" = 'jb'; then
+      file="$file.gpg"
+      urls=("https://cdn.devmole.eu/hashes//$SIGNING_PROJECTNAME/$tbb_version-build$tbb_version_build/$file")
+    else
+      file="$file.asc"
+      urls=( \
+        "https://people.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tbb_version-build$tbb_version_build/$file" \
+        "https://tb-build-04.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tbb_version_type/unsigned/$tbb_version-build$tbb_version_build/$file" \
+        "https://tb-build-05.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tbb_version_type/unsigned/$tbb_version-build$tbb_version_build/$file" \
+      )
+    fi
+    for url in "${urls[@]}"
     do
       if wget -q -O "$tmpfile" "$url"; then
         mv "$tmpfile" "$signed_version_dir/$file-$builder"



View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8140af32c04dccff94f5720aa67f7b4d8dc50517

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8140af32c04dccff94f5720aa67f7b4d8dc50517
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/20230712/63164dd3/attachment-0001.htm>