| 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 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 else | 130 else |
| 131 install -m 644 "${BUILDDIR}/theme_resources_100_percent.pak" "${STAGEDIR}/${
INSTALLDIR}/" | 131 install -m 644 "${BUILDDIR}/theme_resources_100_percent.pak" "${STAGEDIR}/${
INSTALLDIR}/" |
| 132 install -m 644 "${BUILDDIR}/ui_resources_100_percent.pak" "${STAGEDIR}/${INS
TALLDIR}/" | 132 install -m 644 "${BUILDDIR}/ui_resources_100_percent.pak" "${STAGEDIR}/${INS
TALLDIR}/" |
| 133 fi | 133 fi |
| 134 | 134 |
| 135 # ICU data file; only necessary when icu_use_data_file_flag is set to 1 |
| 136 # in build/common.gypi. |
| 137 install -m 644 "${BUILDDIR}/icudtl.dat" "${STAGEDIR}/${INSTALLDIR}/" |
| 138 |
| 135 # sandbox | 139 # sandbox |
| 136 # Rename sandbox binary with hyphen instead of underscore because that's what | 140 # Rename sandbox binary with hyphen instead of underscore because that's what |
| 137 # the code looks for, but the build targets can't use hyphens (scons bug?) | 141 # the code looks for, but the build targets can't use hyphens (scons bug?) |
| 138 install -m 4755 -s "${BUILDDIR}/${PROGNAME}_sandbox" \ | 142 install -m 4755 -s "${BUILDDIR}/${PROGNAME}_sandbox" \ |
| 139 "${STAGEDIR}/${INSTALLDIR}/${PROGNAME}-sandbox" | 143 "${STAGEDIR}/${INSTALLDIR}/${PROGNAME}-sandbox" |
| 140 | 144 |
| 141 # l10n paks | 145 # l10n paks |
| 142 cp -a "${BUILDDIR}/locales" "${STAGEDIR}/${INSTALLDIR}/" | 146 cp -a "${BUILDDIR}/locales" "${STAGEDIR}/${INSTALLDIR}/" |
| 143 find "${STAGEDIR}/${INSTALLDIR}/locales" -type f -exec chmod 644 '{}' \; | 147 find "${STAGEDIR}/${INSTALLDIR}/locales" -type f -exec chmod 644 '{}' \; |
| 144 find "${STAGEDIR}/${INSTALLDIR}/locales" -type d -exec chmod 755 '{}' \; | 148 find "${STAGEDIR}/${INSTALLDIR}/locales" -type d -exec chmod 755 '{}' \; |
| (...skipping 17 matching lines...) Expand all Loading... |
| 162 "${PEPPERFLASH_DESTDIR}/" | 166 "${PEPPERFLASH_DESTDIR}/" |
| 163 | 167 |
| 164 # pdf plugin | 168 # pdf plugin |
| 165 if [ -f "${BUILDDIR}/libpdf.so" ]; then | 169 if [ -f "${BUILDDIR}/libpdf.so" ]; then |
| 166 install -m 644 -s "${BUILDDIR}/libpdf.so" "${STAGEDIR}/${INSTALLDIR}/" | 170 install -m 644 -s "${BUILDDIR}/libpdf.so" "${STAGEDIR}/${INSTALLDIR}/" |
| 167 fi | 171 fi |
| 168 | 172 |
| 169 # peerconnection shared library | 173 # peerconnection shared library |
| 170 if [ -f "${BUILDDIR}/lib/libpeerconnection.so" ]; then | 174 if [ -f "${BUILDDIR}/lib/libpeerconnection.so" ]; then |
| 171 install -m 755 -d "${STAGEDIR}/${INSTALLDIR}/lib/" | 175 install -m 755 -d "${STAGEDIR}/${INSTALLDIR}/lib/" |
| 176 |
| 172 install -m 644 -s "${BUILDDIR}/lib/libpeerconnection.so" "${STAGEDIR}/${INST
ALLDIR}/lib/" | 177 install -m 644 -s "${BUILDDIR}/lib/libpeerconnection.so" "${STAGEDIR}/${INST
ALLDIR}/lib/" |
| 173 fi | 178 fi |
| 174 | 179 |
| 175 # nacl pepper plugin | 180 # nacl pepper plugin |
| 176 if [ -f "${BUILDDIR}/libppGoogleNaClPluginChrome.so" ]; then | 181 if [ -f "${BUILDDIR}/libppGoogleNaClPluginChrome.so" ]; then |
| 177 install -m 644 -s "${BUILDDIR}/libppGoogleNaClPluginChrome.so" "${STAGEDIR}/
${INSTALLDIR}/" | 182 install -m 644 -s "${BUILDDIR}/libppGoogleNaClPluginChrome.so" "${STAGEDIR}/
${INSTALLDIR}/" |
| 178 fi | 183 fi |
| 179 | 184 |
| 180 # nacl_helper and nacl_helper_bootstrap | 185 # nacl_helper and nacl_helper_bootstrap |
| 181 # Don't use "-s" (strip) because this runs binutils "strip", which | 186 # Don't use "-s" (strip) because this runs binutils "strip", which |
| (...skipping 24 matching lines...) Expand all Loading... |
| 206 if [ -d "${BUILDDIR}/default_apps" ]; then | 211 if [ -d "${BUILDDIR}/default_apps" ]; then |
| 207 cp -a "${BUILDDIR}/default_apps" "${STAGEDIR}/${INSTALLDIR}/" | 212 cp -a "${BUILDDIR}/default_apps" "${STAGEDIR}/${INSTALLDIR}/" |
| 208 find "${STAGEDIR}/${INSTALLDIR}/default_apps" -type d -exec chmod 755 '{}' \
; | 213 find "${STAGEDIR}/${INSTALLDIR}/default_apps" -type d -exec chmod 755 '{}' \
; |
| 209 find "${STAGEDIR}/${INSTALLDIR}/default_apps" -type f -exec chmod 644 '{}' \
; | 214 find "${STAGEDIR}/${INSTALLDIR}/default_apps" -type f -exec chmod 644 '{}' \
; |
| 210 fi | 215 fi |
| 211 | 216 |
| 212 # launcher script and symlink | 217 # launcher script and symlink |
| 213 process_template "${BUILDDIR}/installer/common/wrapper" \ | 218 process_template "${BUILDDIR}/installer/common/wrapper" \ |
| 214 "${STAGEDIR}/${INSTALLDIR}/${PACKAGE}" | 219 "${STAGEDIR}/${INSTALLDIR}/${PACKAGE}" |
| 215 chmod 755 "${STAGEDIR}/${INSTALLDIR}/${PACKAGE}" | 220 chmod 755 "${STAGEDIR}/${INSTALLDIR}/${PACKAGE}" |
| 221 if [ ! -f "${STAGEDIR}/${INSTALLDIR}/google-chrome" ]; then |
| 222 ln -sn "${INSTALLDIR}/${PACKAGE}" \ |
| 223 "${STAGEDIR}/${INSTALLDIR}/google-chrome" |
| 224 fi |
| 216 ln -snf "${INSTALLDIR}/${PACKAGE}" \ | 225 ln -snf "${INSTALLDIR}/${PACKAGE}" \ |
| 217 "${STAGEDIR}/usr/bin/${USR_BIN_SYMLINK_NAME}" | 226 "${STAGEDIR}/usr/bin/${USR_BIN_SYMLINK_NAME}" |
| 218 | 227 |
| 219 # app icons | 228 # app icons |
| 220 install -m 644 \ | 229 install -m 644 \ |
| 221 "${BUILDDIR}/installer/theme/product_logo_"*.png \ | 230 "${BUILDDIR}/installer/theme/product_logo_"*.png \ |
| 222 "${BUILDDIR}/installer/theme/product_logo_32.xpm" \ | 231 "${BUILDDIR}/installer/theme/product_logo_32.xpm" \ |
| 223 "${STAGEDIR}/${INSTALLDIR}/" | 232 "${STAGEDIR}/${INSTALLDIR}/" |
| 224 | 233 |
| 225 # desktop integration | 234 # desktop integration |
| 226 install -m 755 "${BUILDDIR}/xdg-mime" "${STAGEDIR}${INSTALLDIR}/" | 235 install -m 755 "${BUILDDIR}/xdg-mime" "${STAGEDIR}${INSTALLDIR}/" |
| 227 install -m 755 "${BUILDDIR}/xdg-settings" "${STAGEDIR}${INSTALLDIR}/" | 236 install -m 755 "${BUILDDIR}/xdg-settings" "${STAGEDIR}${INSTALLDIR}/" |
| 228 process_template "${BUILDDIR}/installer/common/desktop.template" \ | 237 process_template "${BUILDDIR}/installer/common/desktop.template" \ |
| 229 "${STAGEDIR}/usr/share/applications/${PACKAGE}.desktop" | 238 "${STAGEDIR}/usr/share/applications/${PACKAGE}.desktop" |
| 230 chmod 644 "${STAGEDIR}/usr/share/applications/${PACKAGE}.desktop" | 239 chmod 644 "${STAGEDIR}/usr/share/applications/${PACKAGE}.desktop" |
| 231 process_template "${BUILDDIR}/installer/common/default-app.template" \ | 240 process_template "${BUILDDIR}/installer/common/default-app.template" \ |
| 232 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}.xml" | 241 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}.xml" |
| 233 chmod 644 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}.
xml" | 242 chmod 644 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}.
xml" |
| 234 process_template "${BUILDDIR}/installer/common/default-app-block.template" \ | 243 process_template "${BUILDDIR}/installer/common/default-app-block.template" \ |
| 235 "${STAGEDIR}${INSTALLDIR}/default-app-block" | 244 "${STAGEDIR}${INSTALLDIR}/default-app-block" |
| 236 chmod 644 "${STAGEDIR}${INSTALLDIR}/default-app-block" | 245 chmod 644 "${STAGEDIR}${INSTALLDIR}/default-app-block" |
| 237 | 246 |
| 238 # documentation | 247 # documentation |
| 239 install -m 755 "${BUILDDIR}/${PROGNAME}.1" \ | 248 install -m 755 "${BUILDDIR}/${PROGNAME}.1" \ |
| 240 "${STAGEDIR}/usr/share/man/man1/${PACKAGE}.1" | 249 "${STAGEDIR}/usr/share/man/man1/${PACKAGE}.1" |
| 241 } | 250 } |
| OLD | NEW |