| 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 204 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 215 if [ -d "${BUILDDIR}/default_apps" ]; then | 215 if [ -d "${BUILDDIR}/default_apps" ]; then |
| 216 cp -a "${BUILDDIR}/default_apps" "${STAGEDIR}/${INSTALLDIR}/" | 216 cp -a "${BUILDDIR}/default_apps" "${STAGEDIR}/${INSTALLDIR}/" |
| 217 find "${STAGEDIR}/${INSTALLDIR}/default_apps" -type d -exec chmod 755 '{}' \
; | 217 find "${STAGEDIR}/${INSTALLDIR}/default_apps" -type d -exec chmod 755 '{}' \
; |
| 218 find "${STAGEDIR}/${INSTALLDIR}/default_apps" -type f -exec chmod 644 '{}' \
; | 218 find "${STAGEDIR}/${INSTALLDIR}/default_apps" -type f -exec chmod 644 '{}' \
; |
| 219 fi | 219 fi |
| 220 | 220 |
| 221 # launcher script and symlink | 221 # launcher script and symlink |
| 222 process_template "${BUILDDIR}/installer/common/wrapper" \ | 222 process_template "${BUILDDIR}/installer/common/wrapper" \ |
| 223 "${STAGEDIR}/${INSTALLDIR}/${PACKAGE}" | 223 "${STAGEDIR}/${INSTALLDIR}/${PACKAGE}" |
| 224 chmod 755 "${STAGEDIR}/${INSTALLDIR}/${PACKAGE}" | 224 chmod 755 "${STAGEDIR}/${INSTALLDIR}/${PACKAGE}" |
| 225 if [ ! -f "${STAGEDIR}/${INSTALLDIR}/google-chrome" ]; then |
| 226 ln -sn "${INSTALLDIR}/${PACKAGE}" \ |
| 227 "${STAGEDIR}/${INSTALLDIR}/google-chrome" |
| 228 fi |
| 225 ln -snf "${INSTALLDIR}/${PACKAGE}" \ | 229 ln -snf "${INSTALLDIR}/${PACKAGE}" \ |
| 226 "${STAGEDIR}/usr/bin/${USR_BIN_SYMLINK_NAME}" | 230 "${STAGEDIR}/usr/bin/${USR_BIN_SYMLINK_NAME}" |
| 227 | 231 |
| 228 # app icons | 232 # app icons |
| 229 install -m 644 \ | 233 install -m 644 \ |
| 230 "${BUILDDIR}/installer/theme/product_logo_"*.png \ | 234 "${BUILDDIR}/installer/theme/product_logo_"*.png \ |
| 231 "${BUILDDIR}/installer/theme/product_logo_32.xpm" \ | 235 "${BUILDDIR}/installer/theme/product_logo_32.xpm" \ |
| 232 "${STAGEDIR}/${INSTALLDIR}/" | 236 "${STAGEDIR}/${INSTALLDIR}/" |
| 233 | 237 |
| 234 # desktop integration | 238 # desktop integration |
| 235 install -m 755 "${BUILDDIR}/xdg-mime" "${STAGEDIR}${INSTALLDIR}/" | 239 install -m 755 "${BUILDDIR}/xdg-mime" "${STAGEDIR}${INSTALLDIR}/" |
| 236 install -m 755 "${BUILDDIR}/xdg-settings" "${STAGEDIR}${INSTALLDIR}/" | 240 install -m 755 "${BUILDDIR}/xdg-settings" "${STAGEDIR}${INSTALLDIR}/" |
| 237 process_template "${BUILDDIR}/installer/common/desktop.template" \ | 241 process_template "${BUILDDIR}/installer/common/desktop.template" \ |
| 238 "${STAGEDIR}/usr/share/applications/${PACKAGE}.desktop" | 242 "${STAGEDIR}/usr/share/applications/${PACKAGE}.desktop" |
| 239 chmod 644 "${STAGEDIR}/usr/share/applications/${PACKAGE}.desktop" | 243 chmod 644 "${STAGEDIR}/usr/share/applications/${PACKAGE}.desktop" |
| 240 process_template "${BUILDDIR}/installer/common/default-app.template" \ | 244 process_template "${BUILDDIR}/installer/common/default-app.template" \ |
| 241 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}.xml" | 245 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}.xml" |
| 242 chmod 644 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}.
xml" | 246 chmod 644 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}.
xml" |
| 243 process_template "${BUILDDIR}/installer/common/default-app-block.template" \ | 247 process_template "${BUILDDIR}/installer/common/default-app-block.template" \ |
| 244 "${STAGEDIR}${INSTALLDIR}/default-app-block" | 248 "${STAGEDIR}${INSTALLDIR}/default-app-block" |
| 245 chmod 644 "${STAGEDIR}${INSTALLDIR}/default-app-block" | 249 chmod 644 "${STAGEDIR}${INSTALLDIR}/default-app-block" |
| 246 | 250 |
| 247 # documentation | 251 # documentation |
| 248 install -m 755 "${BUILDDIR}/${PROGNAME}.1" \ | 252 install -m 755 "${BUILDDIR}/${PROGNAME}.1" \ |
| 249 "${STAGEDIR}/usr/share/man/man1/${PACKAGE}.1" | 253 "${STAGEDIR}/usr/share/man/man1/${PACKAGE}.1" |
| 250 } | 254 } |
| OLD | NEW |