[tbb-commits] [Git][tpo/applications/tor-browser-build][main] Bug 41039: Keep download-*.json files from previous version when new version does not include them

[boklm (@boklm)]

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


Commits:
315cf59e by Nicolas Vigier at 2023-12-12T10:09:13+01:00
Bug 41039: Keep download-*.json files from previous version when new version does not include them

- - - - -


1 changed file:

- tools/signing/upload-update_responses-to-staticiforme


Changes:

=====================================
tools/signing/upload-update_responses-to-staticiforme
=====================================
@@ -26,8 +26,22 @@ test -n "$(git status --porcelain=v1 | grep -v '^?')" \
 is_project torbrowser && cd update_3
 is_project mullvadbrowser && cd update_1
 
-rm -Rf "$tbb_version_type"
+old_ur=$(mktemp -d)
+trap "rm -Rf $old_ur" EXIT
+mv "$tbb_version_type" "$old_ur/$tbb_version_type"
 tar -xf "$update_responses_tar"
+
+# Keep download-*.json files from previous release if they are not in
+# the new release. This happens when a release does not include some
+# platforms. See tor-browser-build#41039.
+IFS=$'\n'
+for file in $(ls -1 "$old_ur/$tbb_version_type"/download-*.json)
+do
+  fname=$(basename "$file")
+  test -f "$tbb_version_type/$fname" && continue
+  mv "$file" "$tbb_version_type/$fname"
+done
+
 git add "$tbb_version_type"
 git commit -m "$tbb_version_type: new version, $tbb_version"
 git push



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

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/315cf59ee498f76a828132de313d19481443cf61
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/20231212/cca517db/attachment-0001.htm>