[tbb-commits] [Git][tpo/applications/tor-browser][tor-browser-128.2.0esr-14.0-1] fixup! Bug 4234: Use the Firefox Update Process for Base Browser.

[Pier Angelo Vendrame (@pierov)]

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


Commits:
29f0e8bb by Pier Angelo Vendrame at 2024-09-04T19:18:40+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
=====================================
@@ -80,8 +80,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() {
@@ -141,8 +150,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/tor-browser/-/commit/29f0e8bb93faed800afb590c661102537f458727

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/29f0e8bb93faed800afb590c661102537f458727
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/20240904/98ba91f2/attachment-0001.htm>