[gentoo-commits] repo/gentoo:master commit in: eclass/

[Michał Górny]

commit:     63b07de22bddb844d12c1164c1b48b0516b7fa9e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 17 10:38:37 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Apr 25 17:57:48 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63b07de2

gnome2-utils.eclass: Make gnome2_icon_cache_update update all themes

Make the gnome2_icon_cache_update function update all icon themes rather
than depending on gnome2_icon_savelist to select themes to update. This
makes the function easier to use whenever the developer needs it
explicitly (i.e. knows that themes are installed), while the overhead of
regenerating multiple caches is neglible.

 eclass/gnome2-utils.eclass | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/eclass/gnome2-utils.eclass b/eclass/gnome2-utils.eclass
index f2aa2391a53..7db092e1ec6 100644
--- a/eclass/gnome2-utils.eclass
+++ b/eclass/gnome2-utils.eclass
@@ -240,30 +240,30 @@ gnome2_icon_cache_update() {
        local retval=0
        local fails=( )
 
-       for dir in ${GNOME2_ECLASS_ICONS}
+       for dir in "${EROOT%/}"/usr/share/icons/*
        do
-               if [[ -f "${EROOT}${dir}/index.theme" ]] ; then
+               if [[ -f "${dir}/index.theme" ]] ; then
                        local rv=0
 
-                       "${updater}" -qf "${EROOT}${dir}"
+                       "${updater}" -qf "${dir}"
                        rv=$?
 
                        if [[ ! $rv -eq 0 ]] ; then
-                               debug-print "Updating cache failed on 
${EROOT}${dir}"
+                               debug-print "Updating cache failed on ${dir}"
 
                                # Add to the list of failures
-                               fails[$(( ${#fails[@]} + 1 ))]="${EROOT}${dir}"
+                               fails+=( "${dir}" )
 
                                retval=2
                        fi
-               elif [[ $(ls "${EROOT}${dir}") = "icon-theme.cache" ]]; then
+               elif [[ $(ls "${dir}") = "icon-theme.cache" ]]; then
                        # Clear stale cache files after theme uninstallation
-                       rm "${EROOT}${dir}/icon-theme.cache"
+                       rm "${dir}/icon-theme.cache"
                fi
 
-               if [[ -z $(ls "${EROOT}${dir}") ]]; then
+               if [[ -z $(ls "${dir}") ]]; then
                        # Clear empty theme directories after theme 
uninstallation
-                       rmdir "${EROOT}${dir}"
+                       rmdir "${dir}"
                fi
        done