Bug 1804303 - force update to channel-prefs.js on mac. r=bhearsum DON…

…TBUILD

The channel-prefs.js file is normally excluded from updates, both so QA
can edit it for testing, and to enable shipping release candidates to
the beta channel.  However, that means any change to the file contents
we ship risk invalidating the package's signature for users with
preexisting installs.  Such a change happened in bug 1576546, so we're
now forcing an update to the file on macOS to make sure users get the
current, correctly signed, contents.

Differential Revision: https://phabricator.services.mozilla.com/D166190

tools/update-packaging/common.sh

@@ -92,6 +92,10 @@ make_add_instruction() {
 check_for_add_if_not_update() {
   add_if_not_file_chk="$1"
 
+  # XXX unconditional add-if for channel-prefs.js to fix mac signature on old installs (bug 1804303)
+  if [ "$add_if_not_file_chk" = "Contents/Resources/defaults/pref/channel-prefs.js" ]; then
+    return 1
+  fi
   if [ `basename $add_if_not_file_chk` = "channel-prefs.js" -o \
        `basename $add_if_not_file_chk` = "update-settings.ini" ]; then
     ## "true" *giggle*

tools/update-packaging/make_incremental_update.sh

@@ -78,7 +78,8 @@ if [ $# = 0 ]; then
   exit 1
 fi
 
-requested_forced_updates='Contents/MacOS/firefox'
+# force update to channel-prefs.js for bug 1804303
+requested_forced_updates='Contents/MacOS/firefox Contents/Resources/defaults/pref/channel-prefs.js'
 
 while getopts "hqf:" flag
 do