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
1 changed file:
Changes:
| ... | ... | @@ -26,8 +26,22 @@ test -n "$(git status --porcelain=v1 | grep -v '^?')" \ |
| 26 | 26 | is_project torbrowser && cd update_3
|
| 27 | 27 | is_project mullvadbrowser && cd update_1
|
| 28 | 28 | |
| 29 | -rm -Rf "$tbb_version_type"
|
|
| 29 | +old_ur=$(mktemp -d)
|
|
| 30 | +trap "rm -Rf $old_ur" EXIT
|
|
| 31 | +mv "$tbb_version_type" "$old_ur/$tbb_version_type"
|
|
| 30 | 32 | tar -xf "$update_responses_tar"
|
| 33 | + |
|
| 34 | +# Keep download-*.json files from previous release if they are not in
|
|
| 35 | +# the new release. This happens when a release does not include some
|
|
| 36 | +# platforms. See tor-browser-build#41039.
|
|
| 37 | +IFS=$'\n'
|
|
| 38 | +for file in $(ls -1 "$old_ur/$tbb_version_type"/download-*.json)
|
|
| 39 | +do
|
|
| 40 | + fname=$(basename "$file")
|
|
| 41 | + test -f "$tbb_version_type/$fname" && continue
|
|
| 42 | + mv "$file" "$tbb_version_type/$fname"
|
|
| 43 | +done
|
|
| 44 | + |
|
| 31 | 45 | git add "$tbb_version_type"
|
| 32 | 46 | git commit -m "$tbb_version_type: new version, $tbb_version"
|
| 33 | 47 | git push
|