[tbb-commits] [Git][tpo/applications/tor-browser-build][main] 2 commits: Bug 40782: Fetch signatures from tb-build-04 and tb-build-05

[Richard Pospesel (@richard)]

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


Commits:
4003aeea by Nicolas Vigier at 2023-02-14T01:18:32+01:00
Bug 40782: Fetch signatures from tb-build-04 and tb-build-05

- - - - -
638c690d by Nicolas Vigier at 2023-02-14T01:21:34+01:00
Bug 40783: Use $projectname prefix when downloading signatures

Following #40737 the build directory is prefixed with $projectname.

- - - - -


1 changed file:

- tools/signing/download-unsigned-sha256sums-gpg-signatures-from-people-tpo


Changes:

=====================================
tools/signing/download-unsigned-sha256sums-gpg-signatures-from-people-tpo
=====================================
@@ -9,10 +9,18 @@ do
   do
     tmpfile=$(mktemp)
     chmod 644 "$tmpfile"
-    wget -q -O "$tmpfile" "https://people.torproject.org/~$builder/builds/$tbb_version-build$tbb_version_build/$file" || \
-      wget -q -O "$tmpfile" "https://people.torproject.org/~$builder/builds/tor-browser/$tbb_version-build$tbb_version_build/$file" || \
-      wget -q -O "$tmpfile" "https://tb-build-03.torproject.org/~$builder/builds/tor-browser/$tbb_version_type/unsigned/$tbb_version-build$tbb_version_build/$file" && \
-      mv "$tmpfile" "$signed_version_dir/$file-$builder" && echo "Added $file-$builder"
+    for url in \
+      "https://people.torproject.org/~$builder/builds/$tbb_version-build$tbb_version_build/$file" \
+      "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"
+    do
+      if wget -q -O "$tmpfile" "$url"; then
+        mv "$tmpfile" "$signed_version_dir/$file-$builder"
+        echo "Added $file-$builder"
+        break
+      fi
+    done
   done
 done
 exit 0



View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/01391c77d3153eab17605b427ae5dd04ed011e0d...638c690d65f086649efd5049241bdb9f15a0e03e

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/01391c77d3153eab17605b427ae5dd04ed011e0d...638c690d65f086649efd5049241bdb9f15a0e03e
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/20230215/23ff45ac/attachment-0001.htm>