diff options
| author | thestig <thestig@chromium.org> | 2015-04-29 00:11:11 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-29 07:12:30 +0000 |
| commit | 29784655d6847d16ee58e9b75964658ecf3002cd (patch) | |
| tree | 3deeacfefa17567fb828b1e1a3e468214645019d /chrome/installer/linux | |
| parent | 99290e7558260cfa01c3d9f8c9a0256aa342d7b3 (diff) | |
| download | chromium_src-29784655d6847d16ee58e9b75964658ecf3002cd.zip chromium_src-29784655d6847d16ee58e9b75964658ecf3002cd.tar.gz chromium_src-29784655d6847d16ee58e9b75964658ecf3002cd.tar.bz2 | |
Linux: Correct the path to gnome-default-applications.xml.
BUG=171301
Review URL: https://codereview.chromium.org/1111113002
Cr-Commit-Position: refs/heads/master@{#327445}
Diffstat (limited to 'chrome/installer/linux')
| -rw-r--r-- | chrome/installer/linux/common/default-app.template | 3 | ||||
| -rw-r--r-- | chrome/installer/linux/common/postinst.include | 10 |
2 files changed, 7 insertions, 6 deletions
diff --git a/chrome/installer/linux/common/default-app.template b/chrome/installer/linux/common/default-app.template index d3aeb34..3f7e6f7 100644 --- a/chrome/installer/linux/common/default-app.template +++ b/chrome/installer/linux/common/default-app.template @@ -2,7 +2,8 @@ <!DOCTYPE default-apps SYSTEM "gnome-da-list.dtd"> <!-- This file should be put in /usr/share/gnome-control-center/default-apps, or, if that directory does not exist, its web-browser tag patched into - /usr/share/gnome-control-center/gnome-default-applications.xml --> + /usr/share/gnome-control-center/default-apps/gnome-default-applications.xml + --> <default-apps> <web-browsers> <web-browser> diff --git a/chrome/installer/linux/common/postinst.include b/chrome/installer/linux/common/postinst.include index 194e9a4..c659d9a 100644 --- a/chrome/installer/linux/common/postinst.include +++ b/chrome/installer/linux/common/postinst.include @@ -63,11 +63,11 @@ insert_after_first_match() { }" "$1" } -# If /usr/share/gnome-control-center/gnome-default-applications.xml exists, it -# may need to be updated to add ourselves to the default applications list. If -# we find the file and it does not seem to contain our patch already (the patch -# is safe to leave even after uninstall), update it. -GNOME_DFL_APPS=/usr/share/gnome-control-center/gnome-default-applications.xml +# If /usr/share/gnome-control-center/default-apps/gnome-default-applications.xml +# exists, it may need to be updated to add ourselves to the default applications +# list. If we find the file and it does not seem to contain our patch already +# (the patch is safe to leave even after uninstall), update it. +GNOME_DFL_APPS=/usr/share/gnome-control-center/default-apps/gnome-default-applications.xml if [ -f "$GNOME_DFL_APPS" ]; then # Conditionally insert the contents of the file "default-app-block" after the # first "<web-browsers>" line we find in gnome-default-applications.xml |