nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1848414 - On update, don't overwrite existing ChannelPrefs or UpdateSettings Frameworks r=bhearsum,nalexander

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D198898
This commit is contained in:
Robin Steuber 2024-02-21 18:50:35 +00:00
parent 67461fe283
commit dbd6c96f18
1 changed files with 6 additions and 4 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

10
tools/update-packaging/common.sh
View file

@ -92,12 +92,14 @@ make_add_instruction() {
check_for_add_if_not_update() { check_for_add_if_not_update() {
add_if_not_file_chk="$1" add_if_not_file_chk="$1"
if [ "$(basename "$add_if_not_file_chk")" = "channel-prefs.js" -o \ if [[ "$(basename "$add_if_not_file_chk")" = "channel-prefs.js" || \
"$(basename "$add_if_not_file_chk")" = "update-settings.ini" ]; then "$add_if_not_file_chk" =~ (^|/)ChannelPrefs\.framework/ || \
## "true" *giggle* "$(basename "$add_if_not_file_chk")" = "update-settings.ini" || \
"$add_if_not_file_chk" =~ (^|/)UpdateSettings\.framework/ ]]; then
## "true"
return 0; return 0;
fi fi
## 'false'... because this is bash. Oh yay! ## "false"
return 1; return 1;
} }