| OLD | NEW |
| 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 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 120 rm "${DEBUGFILE}" "${STRIPPEDFILE}" | 120 rm "${DEBUGFILE}" "${STRIPPEDFILE}" |
| 121 | 121 |
| 122 # resources | 122 # resources |
| 123 install -m 644 "${BUILDDIR}/resources.pak" "${STAGEDIR}/${INSTALLDIR}/" | 123 install -m 644 "${BUILDDIR}/resources.pak" "${STAGEDIR}/${INSTALLDIR}/" |
| 124 # TODO(mmoss): This has broken a couple times on adding new .pak files. Maybe | 124 # TODO(mmoss): This has broken a couple times on adding new .pak files. Maybe |
| 125 # we should flag all installer files in FILES.cfg and get them from there, so | 125 # we should flag all installer files in FILES.cfg and get them from there, so |
| 126 # there's only one place people need to keep track of such things (and in | 126 # there's only one place people need to keep track of such things (and in |
| 127 # only the public repository). | 127 # only the public repository). |
| 128 if [ -r "${BUILDDIR}/chrome_100_percent.pak" ]; then | 128 if [ -r "${BUILDDIR}/chrome_100_percent.pak" ]; then |
| 129 install -m 644 "${BUILDDIR}/chrome_100_percent.pak" "${STAGEDIR}/${INSTALLDI
R}/" | 129 install -m 644 "${BUILDDIR}/chrome_100_percent.pak" "${STAGEDIR}/${INSTALLDI
R}/" |
| 130 install -m 644 "${BUILDDIR}/chrome_200_percent.pak" "${STAGEDIR}/${INSTALLDI
R}/" |
| 130 else | 131 else |
| 131 install -m 644 "${BUILDDIR}/theme_resources_100_percent.pak" "${STAGEDIR}/${
INSTALLDIR}/" | 132 install -m 644 "${BUILDDIR}/theme_resources_100_percent.pak" "${STAGEDIR}/${
INSTALLDIR}/" |
| 132 install -m 644 "${BUILDDIR}/ui_resources_100_percent.pak" "${STAGEDIR}/${INS
TALLDIR}/" | 133 install -m 644 "${BUILDDIR}/ui_resources_100_percent.pak" "${STAGEDIR}/${INS
TALLDIR}/" |
| 133 fi | 134 fi |
| 134 | 135 |
| 135 # ICU data file; only necessary when icu_use_data_file_flag is set to 1 | 136 # ICU data file; only necessary when icu_use_data_file_flag is set to 1 |
| 136 # in build/common.gypi. | 137 # in build/common.gypi. |
| 137 install -m 644 "${BUILDDIR}/icudtl.dat" "${STAGEDIR}/${INSTALLDIR}/" | 138 install -m 644 "${BUILDDIR}/icudtl.dat" "${STAGEDIR}/${INSTALLDIR}/" |
| 138 | 139 |
| 139 # V8 snapshot files; only necessary when v8_use_external_startup_data is | 140 # V8 snapshot files; only necessary when v8_use_external_startup_data is |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 246 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}.xml" | 247 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}.xml" |
| 247 chmod 644 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}.
xml" | 248 chmod 644 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}.
xml" |
| 248 process_template "${BUILDDIR}/installer/common/default-app-block.template" \ | 249 process_template "${BUILDDIR}/installer/common/default-app-block.template" \ |
| 249 "${STAGEDIR}${INSTALLDIR}/default-app-block" | 250 "${STAGEDIR}${INSTALLDIR}/default-app-block" |
| 250 chmod 644 "${STAGEDIR}${INSTALLDIR}/default-app-block" | 251 chmod 644 "${STAGEDIR}${INSTALLDIR}/default-app-block" |
| 251 | 252 |
| 252 # documentation | 253 # documentation |
| 253 install -m 755 "${BUILDDIR}/${PROGNAME}.1" \ | 254 install -m 755 "${BUILDDIR}/${PROGNAME}.1" \ |
| 254 "${STAGEDIR}/usr/share/man/man1/${PACKAGE}.1" | 255 "${STAGEDIR}/usr/share/man/man1/${PACKAGE}.1" |
| 255 } | 256 } |
| OLD | NEW |