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

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

Issue 1769533003: Add multiarch specification to apt repo config. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2623
Patch Set: add fix from c9702882daa3175654319d844fee7d4c64ee468b Created 4 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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 -e "s#@@PRODUCTURL@@#${PRODUCTURL}#g" \ 66 -e "s#@@PRODUCTURL@@#${PRODUCTURL}#g" \
67 -e "s#@@PREDEPENDS@@#${PREDEPENDS}#g" \ 67 -e "s#@@PREDEPENDS@@#${PREDEPENDS}#g" \
68 -e "s#@@DEPENDS@@#${DEPENDS}#g" \ 68 -e "s#@@DEPENDS@@#${DEPENDS}#g" \
69 -e "s#@@PROVIDES@@#${PROVIDES}#g" \ 69 -e "s#@@PROVIDES@@#${PROVIDES}#g" \
70 -e "s#@@REPLACES@@#${REPLACES}#g" \ 70 -e "s#@@REPLACES@@#${REPLACES}#g" \
71 -e "s#@@CONFLICTS@@#${CONFLICTS}#g" \ 71 -e "s#@@CONFLICTS@@#${CONFLICTS}#g" \
72 -e "s#@@ARCHITECTURE@@#${ARCHITECTURE}#g" \ 72 -e "s#@@ARCHITECTURE@@#${ARCHITECTURE}#g" \
73 -e "s#@@MAINTNAME@@#${MAINTNAME}#g" \ 73 -e "s#@@MAINTNAME@@#${MAINTNAME}#g" \
74 -e "s#@@MAINTMAIL@@#${MAINTMAIL}#g" \ 74 -e "s#@@MAINTMAIL@@#${MAINTMAIL}#g" \
75 -e "s#@@REPOCONFIG@@#${REPOCONFIG}#g" \ 75 -e "s#@@REPOCONFIG@@#${REPOCONFIG}#g" \
76 -e "s#@@SSLREPOCONFIG@@#${SSLREPOCONFIG}#g" \ 76 -e "s#@@REPOCONFIGREGEX@@#${REPOCONFIGREGEX}#g" \
77 -e "s#@@SHORTDESC@@#${SHORTDESC}#g" \ 77 -e "s#@@SHORTDESC@@#${SHORTDESC}#g" \
78 -e "s#@@FULLDESC@@#${FULLDESC}#g" \ 78 -e "s#@@FULLDESC@@#${FULLDESC}#g" \
79 -e "s#@@DEFAULT_FLAGS@@#${DEFAULT_FLAGS:-}#g" \ 79 -e "s#@@DEFAULT_FLAGS@@#${DEFAULT_FLAGS:-}#g" \
80 -e "s#@@SXS_USER_DATA_DIR@@#${SXS_USER_DATA_DIR:-}#g" \ 80 -e "s#@@SXS_USER_DATA_DIR@@#${SXS_USER_DATA_DIR:-}#g" \
81 -e "s#@@USR_BIN_SYMLINK_NAME@@#${USR_BIN_SYMLINK_NAME:-}#g" \ 81 -e "s#@@USR_BIN_SYMLINK_NAME@@#${USR_BIN_SYMLINK_NAME:-}#g" \
82 > "$TMPLOUT" <<< "$TMPLINCL" 82 > "$TMPLOUT" <<< "$TMPLINCL"
83 ) 83 )
84 84
85 # Setup the installation directory hierachy in the package staging area. 85 # Setup the installation directory hierachy in the package staging area.
86 prep_staging_common() { 86 prep_staging_common() {
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}.xml" 240 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}.xml"
241 chmod 644 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}. xml" 241 chmod 644 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}. xml"
242 process_template "${BUILDDIR}/installer/common/default-app-block.template" \ 242 process_template "${BUILDDIR}/installer/common/default-app-block.template" \
243 "${STAGEDIR}${INSTALLDIR}/default-app-block" 243 "${STAGEDIR}${INSTALLDIR}/default-app-block"
244 chmod 644 "${STAGEDIR}${INSTALLDIR}/default-app-block" 244 chmod 644 "${STAGEDIR}${INSTALLDIR}/default-app-block"
245 245
246 # documentation 246 # documentation
247 install -m 755 "${BUILDDIR}/${PROGNAME}.1" \ 247 install -m 755 "${BUILDDIR}/${PROGNAME}.1" \
248 "${STAGEDIR}/usr/share/man/man1/${PACKAGE}.1" 248 "${STAGEDIR}/usr/share/man/man1/${PACKAGE}.1"
249 } 249 }
OLDNEW
« no previous file with comments | « chrome/installer/linux/common/apt.include ('k') | chrome/installer/linux/common/variables.include » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698