summaryrefslogtreecommitdiff
path: root/autoscripts
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2007-11-02 23:21:03 -0400
committerJoey Hess <joey@kodama.kitenet.net>2007-11-02 23:21:03 -0400
commit92e38dee858cbb68f6f986d3faac3da48d714efc (patch)
tree714c87108e22a1f44b1e766c757dfb2bf02ec0a3 /autoscripts
parent9226b1d07f2d65c3d7b43cf1d69947132a5cdab1 (diff)
downloaddebhelper-92e38dee858cbb68f6f986d3faac3da48d714efc.tar.gz
* dh_icons: Now that GTK 2.12 has entered testing, use the much simpler to
call update-icon-caches command. Thanks, Josselin Mouette.
Diffstat (limited to 'autoscripts')
-rw-r--r--autoscripts/postinst-icons8
-rw-r--r--autoscripts/postrm-icons16
2 files changed, 4 insertions, 20 deletions
diff --git a/autoscripts/postinst-icons b/autoscripts/postinst-icons
index 951b613d..9e00f039 100644
--- a/autoscripts/postinst-icons
+++ b/autoscripts/postinst-icons
@@ -1,7 +1,3 @@
-if which gtk-update-icon-cache >/dev/null 2>&1; then
- for dir in #DIRLIST#; do
- if [ -f "$dir"/index.theme ] && [ -f "$dir"/icon-theme.cache ]; then
- gtk-update-icon-cache --force --quiet "$dir"
- fi
- done
+if which update-icon-caches >/dev/null 2>&1 ; then
+ update-icon-caches #DIRLIST#
fi
diff --git a/autoscripts/postrm-icons b/autoscripts/postrm-icons
index 87fd790b..9e00f039 100644
--- a/autoscripts/postrm-icons
+++ b/autoscripts/postrm-icons
@@ -1,15 +1,3 @@
-if [ "$1" = "remove" ]; then
- for dir in #DIRLIST#; do
- if [ -d "$dir" ]; then
- if [ -f "$dir"/index.theme ] && \
- [ -f "$dir"/icon-theme.cache ] && \
- which gtk-update-icon-cache >/dev/null 2>&1
- then
- gtk-update-icon-cache --force --quiet "$dir"
- else
- rm -f "$dir"/icon-theme.cache
- rmdir -p --ignore-fail-on-non-empty "$dir"
- fi
- fi
- done
+if which update-icon-caches >/dev/null 2>&1 ; then
+ update-icon-caches #DIRLIST#
fi