Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7117)

Unified Diff: chrome/installer/linux/common/installer.include

Issue 2424093003: Include the AppData file for Chrome and Chromium (Closed)
Patch Set: Remove the Chromium AppData template to avoid duplicity Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/installer/linux/common/installer.include
diff --git a/chrome/installer/linux/common/installer.include b/chrome/installer/linux/common/installer.include
index d606238d6476e22444fc65c0d4c1ed76d50e063a..d9aaa9781726ba6ab3bd9e1ffdf6431a510bf02f 100644
--- a/chrome/installer/linux/common/installer.include
+++ b/chrome/installer/linux/common/installer.include
@@ -87,6 +87,7 @@ prep_staging_common() {
install -m 755 -d "${STAGEDIR}/${INSTALLDIR}" \
"${STAGEDIR}/usr/bin" \
"${STAGEDIR}/usr/share/applications" \
+ "${STAGEDIR}/usr/share/appdata" \
"${STAGEDIR}/usr/share/gnome-control-center/default-apps" \
"${STAGEDIR}/usr/share/man/man1"
}
@@ -228,6 +229,16 @@ stage_install_common() {
# desktop integration
install -m 755 "${BUILDDIR}/xdg-mime" "${STAGEDIR}${INSTALLDIR}/"
install -m 755 "${BUILDDIR}/xdg-settings" "${STAGEDIR}${INSTALLDIR}/"
+
+ if [ ${PACKAGE:0:6} = google ]; then
+ process_template "${BUILDDIR}/installer/common/google-chrome.appdata.xml.template" \
+ "${STAGEDIR}/usr/share/appdata/${PACKAGE}.appdata.xml"
+ chmod 644 "${STAGEDIR}/usr/share/appdata/${PACKAGE}.appdata.xml"
+ else
+ install -m 644 "${BUILDDIR}/installer/common/chromium-browser.appdata.xml" \
+ "${STAGEDIR}/usr/share/appdata/${PACKAGE}.appdata.xml"
+ fi
+
process_template "${BUILDDIR}/installer/common/desktop.template" \
"${STAGEDIR}/usr/share/applications/${PACKAGE}.desktop"
chmod 644 "${STAGEDIR}/usr/share/applications/${PACKAGE}.desktop"

Powered by Google App Engine
This is Rietveld 408576698