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

Side by Side Diff: chrome/installer/linux/common/installer.include

Issue 2738043003: Revert of Include the AppData file for Chrome and Chromium (Closed)
Patch Set: 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 unified diff | Download patch
OLDNEW
1 # Recursively replace @@include@@ template variables with the referenced file, 1 # Recursively replace @@include@@ template variables with the referenced file,
2 # and write the resulting text to stdout. 2 # and write the resulting text to stdout.
3 process_template_includes() { 3 process_template_includes() {
4 INCSTACK+="$1->" 4 INCSTACK+="$1->"
5 # Includes are relative to the file that does the include. 5 # Includes are relative to the file that does the include.
6 INCDIR=$(dirname $1) 6 INCDIR=$(dirname $1)
7 # Clear IFS so 'read' doesn't trim whitespace 7 # Clear IFS so 'read' doesn't trim whitespace
8 local OLDIFS="$IFS" 8 local OLDIFS="$IFS"
9 IFS='' 9 IFS=''
10 while read -r LINE 10 while read -r LINE
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 221
222 # app icons 222 # app icons
223 install -m 644 \ 223 install -m 644 \
224 "${BUILDDIR}/installer/theme/product_logo_"*.png \ 224 "${BUILDDIR}/installer/theme/product_logo_"*.png \
225 "${BUILDDIR}/installer/theme/product_logo_32.xpm" \ 225 "${BUILDDIR}/installer/theme/product_logo_32.xpm" \
226 "${STAGEDIR}/${INSTALLDIR}/" 226 "${STAGEDIR}/${INSTALLDIR}/"
227 227
228 # desktop integration 228 # desktop integration
229 install -m 755 "${BUILDDIR}/xdg-mime" "${STAGEDIR}${INSTALLDIR}/" 229 install -m 755 "${BUILDDIR}/xdg-mime" "${STAGEDIR}${INSTALLDIR}/"
230 install -m 755 "${BUILDDIR}/xdg-settings" "${STAGEDIR}${INSTALLDIR}/" 230 install -m 755 "${BUILDDIR}/xdg-settings" "${STAGEDIR}${INSTALLDIR}/"
231 if [ ${PACKAGE:0:6} = google ]; then
232 process_template "${BUILDDIR}/installer/common/google-chrome.appdata.xml.tem plate" \
233 "${STAGEDIR}/usr/share/appdata/${PACKAGE}.appdata.xml"
234 chmod 644 "${STAGEDIR}/usr/share/appdata/${PACKAGE}.appdata.xml"
235 else
236 install -m 644 "${BUILDDIR}/installer/common/chromium-browser.appdata.xml" \
237 "${STAGEDIR}/usr/share/appdata/${PACKAGE}.appdata.xml"
238 fi
239 process_template "${BUILDDIR}/installer/common/desktop.template" \ 231 process_template "${BUILDDIR}/installer/common/desktop.template" \
240 "${STAGEDIR}/usr/share/applications/${PACKAGE}.desktop" 232 "${STAGEDIR}/usr/share/applications/${PACKAGE}.desktop"
241 chmod 644 "${STAGEDIR}/usr/share/applications/${PACKAGE}.desktop" 233 chmod 644 "${STAGEDIR}/usr/share/applications/${PACKAGE}.desktop"
242 process_template "${BUILDDIR}/installer/common/default-app.template" \ 234 process_template "${BUILDDIR}/installer/common/default-app.template" \
243 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}.xml" 235 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}.xml"
244 chmod 644 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}. xml" 236 chmod 644 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}. xml"
245 process_template "${BUILDDIR}/installer/common/default-app-block.template" \ 237 process_template "${BUILDDIR}/installer/common/default-app-block.template" \
246 "${STAGEDIR}${INSTALLDIR}/default-app-block" 238 "${STAGEDIR}${INSTALLDIR}/default-app-block"
247 chmod 644 "${STAGEDIR}${INSTALLDIR}/default-app-block" 239 chmod 644 "${STAGEDIR}${INSTALLDIR}/default-app-block"
248 240
249 # documentation 241 # documentation
250 install -m 755 "${BUILDDIR}/${PROGNAME}.1" \ 242 install -m 755 "${BUILDDIR}/${PROGNAME}.1" \
251 "${STAGEDIR}/usr/share/man/man1/${PACKAGE}.1" 243 "${STAGEDIR}/usr/share/man/man1/${PACKAGE}.1"
252 } 244 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698