| 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 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 229 if [ ! -f "${STAGEDIR}/${INSTALLDIR}/google-chrome" ]; then | 229 if [ ! -f "${STAGEDIR}/${INSTALLDIR}/google-chrome" ]; then |
| 230 ln -sn "${INSTALLDIR}/${PACKAGE}" \ | 230 ln -sn "${INSTALLDIR}/${PACKAGE}" \ |
| 231 "${STAGEDIR}/${INSTALLDIR}/google-chrome" | 231 "${STAGEDIR}/${INSTALLDIR}/google-chrome" |
| 232 fi | 232 fi |
| 233 ln -snf "${INSTALLDIR}/${PACKAGE}" \ | 233 ln -snf "${INSTALLDIR}/${PACKAGE}" \ |
| 234 "${STAGEDIR}/usr/bin/${USR_BIN_SYMLINK_NAME}" | 234 "${STAGEDIR}/usr/bin/${USR_BIN_SYMLINK_NAME}" |
| 235 | 235 |
| 236 # app icons | 236 # app icons |
| 237 install -m 644 \ | 237 install -m 644 \ |
| 238 "${BUILDDIR}/installer/theme/product_logo_"*.png \ | 238 "${BUILDDIR}/installer/theme/product_logo_"*.png \ |
| 239 "${BUILDDIR}/installer/theme/product_symbolic_logo_"*.symbolic.png \ |
| 239 "${BUILDDIR}/installer/theme/product_logo_32.xpm" \ | 240 "${BUILDDIR}/installer/theme/product_logo_32.xpm" \ |
| 240 "${STAGEDIR}/${INSTALLDIR}/" | 241 "${STAGEDIR}/${INSTALLDIR}/" |
| 241 | 242 |
| 242 # desktop integration | 243 # desktop integration |
| 243 install -m 755 "${BUILDDIR}/xdg-mime" "${STAGEDIR}${INSTALLDIR}/" | 244 install -m 755 "${BUILDDIR}/xdg-mime" "${STAGEDIR}${INSTALLDIR}/" |
| 244 install -m 755 "${BUILDDIR}/xdg-settings" "${STAGEDIR}${INSTALLDIR}/" | 245 install -m 755 "${BUILDDIR}/xdg-settings" "${STAGEDIR}${INSTALLDIR}/" |
| 245 process_template "${BUILDDIR}/installer/common/desktop.template" \ | 246 process_template "${BUILDDIR}/installer/common/desktop.template" \ |
| 246 "${STAGEDIR}/usr/share/applications/${PACKAGE}.desktop" | 247 "${STAGEDIR}/usr/share/applications/${PACKAGE}.desktop" |
| 247 chmod 644 "${STAGEDIR}/usr/share/applications/${PACKAGE}.desktop" | 248 chmod 644 "${STAGEDIR}/usr/share/applications/${PACKAGE}.desktop" |
| 248 process_template "${BUILDDIR}/installer/common/default-app.template" \ | 249 process_template "${BUILDDIR}/installer/common/default-app.template" \ |
| 249 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}.xml" | 250 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}.xml" |
| 250 chmod 644 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}.
xml" | 251 chmod 644 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}.
xml" |
| 251 process_template "${BUILDDIR}/installer/common/default-app-block.template" \ | 252 process_template "${BUILDDIR}/installer/common/default-app-block.template" \ |
| 252 "${STAGEDIR}${INSTALLDIR}/default-app-block" | 253 "${STAGEDIR}${INSTALLDIR}/default-app-block" |
| 253 chmod 644 "${STAGEDIR}${INSTALLDIR}/default-app-block" | 254 chmod 644 "${STAGEDIR}${INSTALLDIR}/default-app-block" |
| 254 | 255 |
| 255 # documentation | 256 # documentation |
| 256 install -m 755 "${BUILDDIR}/${PROGNAME}.1" \ | 257 install -m 755 "${BUILDDIR}/${PROGNAME}.1" \ |
| 257 "${STAGEDIR}/usr/share/man/man1/${PACKAGE}.1" | 258 "${STAGEDIR}/usr/share/man/man1/${PACKAGE}.1" |
| 258 } | 259 } |
| OLD | NEW |