Pier Angelo Vendrame pushed to branch mullvad-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser

Commits: b3998ef9 by Pier Angelo Vendrame at 2024-09-04T19:25:16+02:00 fixup! Bug 4234: Use the Firefox Update Process for Base Browser.

Bug 42745: Remove our changes to tools/update-packaging/common.sh.

These changes are relevant only to extension directories, which we have not been using for a long time (if we ever did). So, we do not have any reason to keep carrying those changes.

- - - - -

1 changed file:

- tools/update-packaging/common.sh

Changes:

===================================== tools/update-packaging/common.sh ===================================== @@ -76,8 +76,17 @@ make_add_instruction() { forced= fi

- verbose_notice " add "$f"$forced" - echo "add "$f"" >> "$filev3" + is_extension=$(echo "$f" | grep -c 'distribution/extensions/.*/') + if [ $is_extension = "1" ]; then + # Use the subdirectory of the extensions folder as the file to test + # before performing this add instruction. + testdir=$(echo "$f" | sed 's/(.*distribution/extensions/[^/]*)/.*/\1/') + verbose_notice " add-if "$testdir" "$f"" + echo "add-if "$testdir" "$f"" >> "$filev3" + else + verbose_notice " add "$f"$forced" + echo "add "$f"" >> "$filev3" + fi }

check_for_add_if_not_update() { @@ -106,8 +115,17 @@ make_patch_instruction() { f="$1" filev3="$2"

- verbose_notice " patch "$f.patch" "$f"" - echo "patch "$f.patch" "$f"" >> "$filev3" + is_extension=$(echo "$f" | grep -c 'distribution/extensions/.*/') + if [ $is_extension = "1" ]; then + # Use the subdirectory of the extensions folder as the file to test + # before performing this add instruction. + testdir=$(echo "$f" | sed 's/(.*distribution/extensions/[^/]*)/.*/\1/') + verbose_notice " patch-if "$testdir" "$f.patch" "$f"" + echo "patch-if "$testdir" "$f.patch" "$f"" >> "$filev3" + else + verbose_notice " patch "$f.patch" "$f"" + echo "patch "$f.patch" "$f"" >> "$filev3" + fi }

append_remove_instructions() {

View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/b399...