--- trunk/include/gnome2.minc 2014/09/02 09:42:32 72 +++ trunk/include/gnome2.minc 2014/09/02 09:48:27 73 @@ -24,26 +24,23 @@ # first update gconf if [ -x ${MROOT}/usr/bin/gconftool-2 ] then - if [ -d ${BUILDDIR}/${PKGNAME}/binfiles/etc/gconf/schemas ] - then - pushd ${BUILDDIR}/${PKGNAME}/binfiles &> /dev/null - local schemas=$(find 'etc/gconf/schemas/' -name '*.schemas' 2> /dev/null) - popd &> /dev/null - - # abort here, if no schemas where found - [[ -z ${schemas} ]] && return - - echo "Updating gconf schemas ..." - export GCONF_CONFIG_SOURCE=$(${MROOT}/usr/bin/gconftool-2 --get-default-source) - - local i - for i in ${schemas} - do - # echo "DEBUG::gconf install ${i}" - ${MROOT}/usr/bin/gconftool-2 --makefile-install-rule ${MROOT}/${i} 1>/dev/null - done - gn2_reload_gconf - fi + pushd ${BUILDDIR}/${PKGNAME}/binfiles &> /dev/null + local schemas=$(find 'etc/gconf/schemas/' -name '*.schemas' 2> /dev/null) + popd &> /dev/null + + # abort here, if no schemas where found + [[ -z ${schemas} ]] && return + + echo "Updating gconf schemas ..." + export GCONF_CONFIG_SOURCE=$(${MROOT}/usr/bin/gconftool-2 --get-default-source) + + local i + for i in ${schemas} + do + # echo "DEBUG::gconf install ${i}" + ${MROOT}/usr/bin/gconftool-2 --makefile-install-rule ${MROOT}/${i} 1>/dev/null + done + gn2_reload_gconf fi } @@ -63,11 +60,8 @@ # update desktop db if [ -x ${MROOT}/usr/bin/update-desktop-database ] then - if [ -d ${BUILDDIR}/${PKGNAME}/binfiles/usr/share/applications ] - then - echo "Updating desktop mime database ..." - ${MROOT}/usr/bin/update-desktop-database -q ${MROOT}/usr/share/applications - fi + echo "Updating desktop mime database ..." + ${MROOT}/usr/bin/update-desktop-database -q ${MROOT}/usr/share/applications fi } @@ -76,11 +70,8 @@ # update mime db if [ -x ${MROOT}/usr/bin/update-mime-database ] then - if [ -d ${BUILDDIR}/${PKGNAME}/binfiles/usr/share/mime ] - then - echo "Updating shared mime info database ..." - ${MROOT}/usr/bin/update-mime-database ${MROOT}/usr/share/mime - fi + echo "Updating shared mime info database ..." + ${MROOT}/usr/bin/update-mime-database ${MROOT}/usr/share/mime fi } @@ -88,25 +79,22 @@ { if [ -x ${MROOT}/usr/bin/gtk-update-icon-cache ] then - if [ -d ${BUILDDIR}/${PKGNAME}/binfiles/usr/share/icons ] - then - pushd ${BUILDDIR}/${PKGNAME}/binfiles &> /dev/null - local icons=$(find 'usr/share/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null) - popd &> /dev/null - - # abort here, if no icons where found - [[ -z ${icons} ]] && return - - echo "Updating icons cache ..." - local i - for i in ${icons} - do - if [[ -f ${MROOT}/${i}/index.theme ]] - then - ${MROOT}/usr/bin/gtk-update-icon-cache -qf ${MROOT}/${i} - fi - done - fi + pushd ${BUILDDIR}/${PKGNAME}/binfiles &> /dev/null + local icons=$(find 'usr/share/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null) + popd &> /dev/null + + # abort here, if no icons where found + [[ -z ${icons} ]] && return + + echo "Updating icons cache ..." + local i + for i in ${icons} + do + if [[ -f ${MROOT}/${i}/index.theme ]] + then + ${MROOT}/usr/bin/gtk-update-icon-cache -qf ${MROOT}/${i} + fi + done fi } @@ -114,11 +102,8 @@ { if [ -x ${MROOT}/usr/bin/glib-compile-schemas ] then - if [ -d ${BUILDDIR}/${PKGNAME}/binfiles/usr/share/glib-2.0/schemas ] - then - echo "Updating glib schemas ..." - ${MROOT}/usr/bin/glib-compile-schemas ${MROOT}/usr/share/glib-2.0/schemas - fi + echo "Updating glib schemas ..." + ${MROOT}/usr/bin/glib-compile-schemas ${MROOT}/usr/share/glib-2.0/schemas fi } @@ -126,11 +111,8 @@ { if [ -x ${MROOT}/usr/bin/gio-querymodules ] then - if [ -d ${BUILDDIR}/${PKGNAME}/binfiles/usr/$(mlibdir)/gio/modules ] - then - echo "Updating glib gio modules ..." - ${MROOT}/usr/bin/gio-querymodules ${MROOT}/usr/$(mlibdir)/gio/modules - fi + echo "Updating glib gio modules ..." + ${MROOT}/usr/bin/gio-querymodules ${MROOT}/usr/$(mlibdir)/gio/modules fi }