forked from mirrors/gecko-dev
Bug 1848414 - On update, don't overwrite existing ChannelPrefs or UpdateSettings Frameworks r=bhearsum,nalexander
Differential Revision: https://phabricator.services.mozilla.com/D198898
This commit is contained in:
parent
67461fe283
commit
dbd6c96f18
1 changed files with 6 additions and 4 deletions
|
|
@ -92,12 +92,14 @@ make_add_instruction() {
|
|||
check_for_add_if_not_update() {
|
||||
add_if_not_file_chk="$1"
|
||||
|
||||
if [ "$(basename "$add_if_not_file_chk")" = "channel-prefs.js" -o \
|
||||
"$(basename "$add_if_not_file_chk")" = "update-settings.ini" ]; then
|
||||
## "true" *giggle*
|
||||
if [[ "$(basename "$add_if_not_file_chk")" = "channel-prefs.js" || \
|
||||
"$add_if_not_file_chk" =~ (^|/)ChannelPrefs\.framework/ || \
|
||||
"$(basename "$add_if_not_file_chk")" = "update-settings.ini" || \
|
||||
"$add_if_not_file_chk" =~ (^|/)UpdateSettings\.framework/ ]]; then
|
||||
## "true"
|
||||
return 0;
|
||||
fi
|
||||
## 'false'... because this is bash. Oh yay!
|
||||
## "false"
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue