From 282672dfd4fdecb5f56137a297125a4ac6fc12a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Jerna=C5=9B?= Date: Fri, 18 Jun 2010 13:35:20 +0200 Subject: [PATCH] Add icon theme installable icons --- Makefile.am | 1 + configure.ac | 2 + data/icons/Makefile.am | 61 ++++++ ...atar-default.png => avatar-default-16.png} | Bin ...atar-default.png => avatar-default-22.png} | Bin ...atar-default.png => avatar-default-24.png} | Bin ...atar-default.png => avatar-default-32.png} | Bin ...atar-default.png => avatar-default-48.png} | Bin ...cument-added.png => document-added-16.png} | Bin ...ment-edited.png => document-edited-16.png} | Bin ...cument-moved.png => document-moved-16.png} | Bin ...nt-removed.png => document-removed-16.png} | Bin ...ync-error.png => emblem-sync-error-22.png} | Bin ...ync-error.png => emblem-sync-error-24.png} | Bin ...emblem-synced.png => emblem-synced-22.png} | Bin ...emblem-synced.png => emblem-synced-24.png} | Bin ...blem-syncing.png => emblem-syncing-22.png} | Bin ...blem-syncing.png => emblem-syncing-24.png} | Bin .../fedorahosted.png => fedorahosted-16.png} | Bin .../16x16/places/folder.png => folder-16.png} | Bin .../22x22/places/folder.png => folder-22.png} | Bin .../24x24/places/folder.png => folder-24.png} | Bin .../places/folder.png => folder-256.png} | Bin .../32x32/places/folder.png => folder-32.png} | Bin .../48x48/places/folder.png => folder-48.png} | Bin ...leshare.png => folder-sparkleshare-16.png} | Bin ...leshare.png => folder-sparkleshare-22.png} | Bin ...leshare.png => folder-sparkleshare-24.png} | Bin ...eshare.png => folder-sparkleshare-256.png} | Bin ...leshare.png => folder-sparkleshare-32.png} | Bin ...leshare.png => folder-sparkleshare-48.png} | Bin ...ync-error.png => folder-sync-error-22.png} | Bin ...ync-error.png => folder-sync-error-24.png} | Bin ...folder-synced.png => folder-synced-22.png} | Bin ...folder-synced.png => folder-synced-24.png} | Bin ...lder-syncing.png => folder-syncing-22.png} | Bin ...lder-syncing.png => folder-syncing-24.png} | Bin .../16x16/places/github.png => github-16.png} | Bin .../places/gitorious.png => gitorious-16.png} | Bin .../16x16/places/gnome.png => gnome-16.png} | Bin ...ng => process-syncing-sparkleshare-24.png} | Bin ...ess-working.png => process-working-48.png} | Bin icon-theme-installer | 179 ++++++++++++++++++ 43 files changed, 243 insertions(+) create mode 100644 data/icons/Makefile.am rename data/icons/{hicolor/16x16/status/avatar-default.png => avatar-default-16.png} (100%) rename data/icons/{hicolor/22x22/status/avatar-default.png => avatar-default-22.png} (100%) rename data/icons/{hicolor/24x24/status/avatar-default.png => avatar-default-24.png} (100%) rename data/icons/{hicolor/32x32/status/avatar-default.png => avatar-default-32.png} (100%) rename data/icons/{hicolor/48x48/status/avatar-default.png => avatar-default-48.png} (100%) rename data/icons/{hicolor/16x16/status/document-added.png => document-added-16.png} (100%) rename data/icons/{hicolor/16x16/status/document-edited.png => document-edited-16.png} (100%) rename data/icons/{hicolor/16x16/status/document-moved.png => document-moved-16.png} (100%) rename data/icons/{hicolor/16x16/status/document-removed.png => document-removed-16.png} (100%) rename data/icons/{hicolor/22x22/emblems/emblem-sync-error.png => emblem-sync-error-22.png} (100%) rename data/icons/{hicolor/24x24/emblems/emblem-sync-error.png => emblem-sync-error-24.png} (100%) rename data/icons/{hicolor/22x22/emblems/emblem-synced.png => emblem-synced-22.png} (100%) rename data/icons/{hicolor/24x24/emblems/emblem-synced.png => emblem-synced-24.png} (100%) rename data/icons/{hicolor/22x22/emblems/emblem-syncing.png => emblem-syncing-22.png} (100%) rename data/icons/{hicolor/24x24/emblems/emblem-syncing.png => emblem-syncing-24.png} (100%) rename data/icons/{hicolor/16x16/places/fedorahosted.png => fedorahosted-16.png} (100%) rename data/icons/{hicolor/16x16/places/folder.png => folder-16.png} (100%) rename data/icons/{hicolor/22x22/places/folder.png => folder-22.png} (100%) rename data/icons/{hicolor/24x24/places/folder.png => folder-24.png} (100%) rename data/icons/{hicolor/256x256/places/folder.png => folder-256.png} (100%) rename data/icons/{hicolor/32x32/places/folder.png => folder-32.png} (100%) rename data/icons/{hicolor/48x48/places/folder.png => folder-48.png} (100%) rename data/icons/{hicolor/16x16/places/folder-sparkleshare.png => folder-sparkleshare-16.png} (100%) rename data/icons/{hicolor/22x22/places/folder-sparkleshare.png => folder-sparkleshare-22.png} (100%) rename data/icons/{hicolor/24x24/places/folder-sparkleshare.png => folder-sparkleshare-24.png} (100%) rename data/icons/{hicolor/256x256/places/folder-sparkleshare.png => folder-sparkleshare-256.png} (100%) rename data/icons/{hicolor/32x32/places/folder-sparkleshare.png => folder-sparkleshare-32.png} (100%) rename data/icons/{hicolor/48x48/places/folder-sparkleshare.png => folder-sparkleshare-48.png} (100%) rename data/icons/{hicolor/22x22/status/folder-sync-error.png => folder-sync-error-22.png} (100%) rename data/icons/{hicolor/24x24/status/folder-sync-error.png => folder-sync-error-24.png} (100%) rename data/icons/{hicolor/22x22/status/folder-synced.png => folder-synced-22.png} (100%) rename data/icons/{hicolor/24x24/status/folder-synced.png => folder-synced-24.png} (100%) rename data/icons/{hicolor/22x22/status/folder-syncing.png => folder-syncing-22.png} (100%) rename data/icons/{hicolor/24x24/status/folder-syncing.png => folder-syncing-24.png} (100%) rename data/icons/{hicolor/16x16/places/github.png => github-16.png} (100%) rename data/icons/{hicolor/16x16/places/gitorious.png => gitorious-16.png} (100%) rename data/icons/{hicolor/16x16/places/gnome.png => gnome-16.png} (100%) rename data/icons/{hicolor/24x24/animations/process-syncing-sparkleshare.png => process-syncing-sparkleshare-24.png} (100%) rename data/icons/{hicolor/48x48/animations/process-working.png => process-working-48.png} (100%) create mode 100755 icon-theme-installer diff --git a/Makefile.am b/Makefile.am index ec856052..a55ddf4d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,6 +2,7 @@ SUBDIRS = \ build \ notify-sharp \ SparkleShare \ + data \ po DISTCLEANFILES = \ diff --git a/configure.ac b/configure.ac index b90f726c..7a3f26fb 100644 --- a/configure.ac +++ b/configure.ac @@ -86,6 +86,8 @@ SparkleShare/sparkleshare SparkleShare/Defines.cs SparkleShare/AssemblyInfo.cs SparkleShare/Makefile +data/Makefile +data/icons/Makefile po/Makefile.in Makefile diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am new file mode 100644 index 00000000..5ff9f918 --- /dev/null +++ b/data/icons/Makefile.am @@ -0,0 +1,61 @@ +theme = hicolor +themedir = $(pkgdatadir)/icons/$(theme) +hicolordir = $(DESTDIR)$(datadir)/icons/hicolor + +theme_icons = \ + animations,process-syncing-sparkleshare-24.png \ + animations,process-working-48.png \ + emblems,emblem-synced-22.png \ + emblems,emblem-synced-24.png \ + emblems,emblem-sync-error-22.png \ + emblems,emblem-sync-error-24.png \ + emblems,emblem-syncing-22.png \ + emblems,emblem-syncing-24.png \ + places,fedorahosted-16.png \ + places,folder-16.png \ + places,folder-22.png \ + places,folder-24.png \ + places,folder-256.png \ + places,folder-32.png \ + places,folder-48.png \ + places,folder-sparkleshare-16.png \ + places,folder-sparkleshare-22.png \ + places,folder-sparkleshare-24.png \ + places,folder-sparkleshare-256.png \ + places,folder-sparkleshare-32.png \ + places,folder-sparkleshare-48.png \ + places,github-16.png \ + places,gitorious-16.png \ + places,gnome-16.png \ + status,avatar-default-16.png \ + status,avatar-default-22.png \ + status,avatar-default-24.png \ + status,avatar-default-32.png \ + status,avatar-default-48.png \ + status,document-added-16.png \ + status,document-edited-16.png \ + status,document-moved-16.png \ + status,document-removed-16.png \ + status,folder-synced-22.png \ + status,folder-synced-24.png \ + status,folder-sync-error-22.png \ + status,folder-sync-error-24.png \ + status,folder-syncing-22.png \ + status,folder-syncing-24.png + +install_icon_exec = $(top_srcdir)/icon-theme-installer \ + -t "$(theme)" \ + -s "$(srcdir)" \ + -d "x$(DESTDIR)" \ + -b "$(themedir)" \ + -m "$(mkinstalldirs)" \ + -x "$(INSTALL_DATA)" + +install-data-local: + @-$(install_icon_exec) -i $(theme_icons) + +uninstall-hook: + @-$(install_icon_exec) -u $(theme_icons) + +MAINTAINERCLEANFILES = Makefile.in +EXTRA_DIST = $(wildcard *.png *.svg) diff --git a/data/icons/hicolor/16x16/status/avatar-default.png b/data/icons/avatar-default-16.png similarity index 100% rename from data/icons/hicolor/16x16/status/avatar-default.png rename to data/icons/avatar-default-16.png diff --git a/data/icons/hicolor/22x22/status/avatar-default.png b/data/icons/avatar-default-22.png similarity index 100% rename from data/icons/hicolor/22x22/status/avatar-default.png rename to data/icons/avatar-default-22.png diff --git a/data/icons/hicolor/24x24/status/avatar-default.png b/data/icons/avatar-default-24.png similarity index 100% rename from data/icons/hicolor/24x24/status/avatar-default.png rename to data/icons/avatar-default-24.png diff --git a/data/icons/hicolor/32x32/status/avatar-default.png b/data/icons/avatar-default-32.png similarity index 100% rename from data/icons/hicolor/32x32/status/avatar-default.png rename to data/icons/avatar-default-32.png diff --git a/data/icons/hicolor/48x48/status/avatar-default.png b/data/icons/avatar-default-48.png similarity index 100% rename from data/icons/hicolor/48x48/status/avatar-default.png rename to data/icons/avatar-default-48.png diff --git a/data/icons/hicolor/16x16/status/document-added.png b/data/icons/document-added-16.png similarity index 100% rename from data/icons/hicolor/16x16/status/document-added.png rename to data/icons/document-added-16.png diff --git a/data/icons/hicolor/16x16/status/document-edited.png b/data/icons/document-edited-16.png similarity index 100% rename from data/icons/hicolor/16x16/status/document-edited.png rename to data/icons/document-edited-16.png diff --git a/data/icons/hicolor/16x16/status/document-moved.png b/data/icons/document-moved-16.png similarity index 100% rename from data/icons/hicolor/16x16/status/document-moved.png rename to data/icons/document-moved-16.png diff --git a/data/icons/hicolor/16x16/status/document-removed.png b/data/icons/document-removed-16.png similarity index 100% rename from data/icons/hicolor/16x16/status/document-removed.png rename to data/icons/document-removed-16.png diff --git a/data/icons/hicolor/22x22/emblems/emblem-sync-error.png b/data/icons/emblem-sync-error-22.png similarity index 100% rename from data/icons/hicolor/22x22/emblems/emblem-sync-error.png rename to data/icons/emblem-sync-error-22.png diff --git a/data/icons/hicolor/24x24/emblems/emblem-sync-error.png b/data/icons/emblem-sync-error-24.png similarity index 100% rename from data/icons/hicolor/24x24/emblems/emblem-sync-error.png rename to data/icons/emblem-sync-error-24.png diff --git a/data/icons/hicolor/22x22/emblems/emblem-synced.png b/data/icons/emblem-synced-22.png similarity index 100% rename from data/icons/hicolor/22x22/emblems/emblem-synced.png rename to data/icons/emblem-synced-22.png diff --git a/data/icons/hicolor/24x24/emblems/emblem-synced.png b/data/icons/emblem-synced-24.png similarity index 100% rename from data/icons/hicolor/24x24/emblems/emblem-synced.png rename to data/icons/emblem-synced-24.png diff --git a/data/icons/hicolor/22x22/emblems/emblem-syncing.png b/data/icons/emblem-syncing-22.png similarity index 100% rename from data/icons/hicolor/22x22/emblems/emblem-syncing.png rename to data/icons/emblem-syncing-22.png diff --git a/data/icons/hicolor/24x24/emblems/emblem-syncing.png b/data/icons/emblem-syncing-24.png similarity index 100% rename from data/icons/hicolor/24x24/emblems/emblem-syncing.png rename to data/icons/emblem-syncing-24.png diff --git a/data/icons/hicolor/16x16/places/fedorahosted.png b/data/icons/fedorahosted-16.png similarity index 100% rename from data/icons/hicolor/16x16/places/fedorahosted.png rename to data/icons/fedorahosted-16.png diff --git a/data/icons/hicolor/16x16/places/folder.png b/data/icons/folder-16.png similarity index 100% rename from data/icons/hicolor/16x16/places/folder.png rename to data/icons/folder-16.png diff --git a/data/icons/hicolor/22x22/places/folder.png b/data/icons/folder-22.png similarity index 100% rename from data/icons/hicolor/22x22/places/folder.png rename to data/icons/folder-22.png diff --git a/data/icons/hicolor/24x24/places/folder.png b/data/icons/folder-24.png similarity index 100% rename from data/icons/hicolor/24x24/places/folder.png rename to data/icons/folder-24.png diff --git a/data/icons/hicolor/256x256/places/folder.png b/data/icons/folder-256.png similarity index 100% rename from data/icons/hicolor/256x256/places/folder.png rename to data/icons/folder-256.png diff --git a/data/icons/hicolor/32x32/places/folder.png b/data/icons/folder-32.png similarity index 100% rename from data/icons/hicolor/32x32/places/folder.png rename to data/icons/folder-32.png diff --git a/data/icons/hicolor/48x48/places/folder.png b/data/icons/folder-48.png similarity index 100% rename from data/icons/hicolor/48x48/places/folder.png rename to data/icons/folder-48.png diff --git a/data/icons/hicolor/16x16/places/folder-sparkleshare.png b/data/icons/folder-sparkleshare-16.png similarity index 100% rename from data/icons/hicolor/16x16/places/folder-sparkleshare.png rename to data/icons/folder-sparkleshare-16.png diff --git a/data/icons/hicolor/22x22/places/folder-sparkleshare.png b/data/icons/folder-sparkleshare-22.png similarity index 100% rename from data/icons/hicolor/22x22/places/folder-sparkleshare.png rename to data/icons/folder-sparkleshare-22.png diff --git a/data/icons/hicolor/24x24/places/folder-sparkleshare.png b/data/icons/folder-sparkleshare-24.png similarity index 100% rename from data/icons/hicolor/24x24/places/folder-sparkleshare.png rename to data/icons/folder-sparkleshare-24.png diff --git a/data/icons/hicolor/256x256/places/folder-sparkleshare.png b/data/icons/folder-sparkleshare-256.png similarity index 100% rename from data/icons/hicolor/256x256/places/folder-sparkleshare.png rename to data/icons/folder-sparkleshare-256.png diff --git a/data/icons/hicolor/32x32/places/folder-sparkleshare.png b/data/icons/folder-sparkleshare-32.png similarity index 100% rename from data/icons/hicolor/32x32/places/folder-sparkleshare.png rename to data/icons/folder-sparkleshare-32.png diff --git a/data/icons/hicolor/48x48/places/folder-sparkleshare.png b/data/icons/folder-sparkleshare-48.png similarity index 100% rename from data/icons/hicolor/48x48/places/folder-sparkleshare.png rename to data/icons/folder-sparkleshare-48.png diff --git a/data/icons/hicolor/22x22/status/folder-sync-error.png b/data/icons/folder-sync-error-22.png similarity index 100% rename from data/icons/hicolor/22x22/status/folder-sync-error.png rename to data/icons/folder-sync-error-22.png diff --git a/data/icons/hicolor/24x24/status/folder-sync-error.png b/data/icons/folder-sync-error-24.png similarity index 100% rename from data/icons/hicolor/24x24/status/folder-sync-error.png rename to data/icons/folder-sync-error-24.png diff --git a/data/icons/hicolor/22x22/status/folder-synced.png b/data/icons/folder-synced-22.png similarity index 100% rename from data/icons/hicolor/22x22/status/folder-synced.png rename to data/icons/folder-synced-22.png diff --git a/data/icons/hicolor/24x24/status/folder-synced.png b/data/icons/folder-synced-24.png similarity index 100% rename from data/icons/hicolor/24x24/status/folder-synced.png rename to data/icons/folder-synced-24.png diff --git a/data/icons/hicolor/22x22/status/folder-syncing.png b/data/icons/folder-syncing-22.png similarity index 100% rename from data/icons/hicolor/22x22/status/folder-syncing.png rename to data/icons/folder-syncing-22.png diff --git a/data/icons/hicolor/24x24/status/folder-syncing.png b/data/icons/folder-syncing-24.png similarity index 100% rename from data/icons/hicolor/24x24/status/folder-syncing.png rename to data/icons/folder-syncing-24.png diff --git a/data/icons/hicolor/16x16/places/github.png b/data/icons/github-16.png similarity index 100% rename from data/icons/hicolor/16x16/places/github.png rename to data/icons/github-16.png diff --git a/data/icons/hicolor/16x16/places/gitorious.png b/data/icons/gitorious-16.png similarity index 100% rename from data/icons/hicolor/16x16/places/gitorious.png rename to data/icons/gitorious-16.png diff --git a/data/icons/hicolor/16x16/places/gnome.png b/data/icons/gnome-16.png similarity index 100% rename from data/icons/hicolor/16x16/places/gnome.png rename to data/icons/gnome-16.png diff --git a/data/icons/hicolor/24x24/animations/process-syncing-sparkleshare.png b/data/icons/process-syncing-sparkleshare-24.png similarity index 100% rename from data/icons/hicolor/24x24/animations/process-syncing-sparkleshare.png rename to data/icons/process-syncing-sparkleshare-24.png diff --git a/data/icons/hicolor/48x48/animations/process-working.png b/data/icons/process-working-48.png similarity index 100% rename from data/icons/hicolor/48x48/animations/process-working.png rename to data/icons/process-working-48.png diff --git a/icon-theme-installer b/icon-theme-installer new file mode 100755 index 00000000..328cf736 --- /dev/null +++ b/icon-theme-installer @@ -0,0 +1,179 @@ +#!/bin/bash + +# icon-theme-installer +# Copyright (C) 2006 Novell, Inc. +# Written by Aaron Bockover +# Licensed under the MIT/X11 license +# +# This script is meant to be invoked from within a Makefile/Makefile.am +# in the install-data-local and uninstall-data sections. It handles the +# task of properly installing icons into the icon theme. It requires a +# few arguments to set up its environment, and a list of files to be +# installed. The format of the file list is critical: +# +# , +# +# apps,music-player-banshee.svg +# apps,music-player-banshee-16.png +# apps,music-player-banshee-22.png +# +# is the icon theme category, for instance, apps, devices, +# actions, emblems... +# +# must have a basename in the form of: +# +# proper-theme-name[-]. +# +# Where should be either nothing, which will default to scalable +# or \-[0-9]{2}, which will expand to x. For example: +# +# music-player-banshee-16.png +# +# The here is -16 and will expand to 16x16 per the icon theme spec +# +# What follows is an example Makefile.am for icon theme installation: +# +# --------------- +# theme=hicolor +# themedir=$(datadir)/icons/$(theme) +# theme_icons = \ +# apps,music-player-banshee.svg \ +# apps,music-player-banshee-16.png \ +# apps,music-player-banshee-22.png \ +# apps,music-player-banshee-24.png \ +# apps,music-player-banshee-32.png +# +# install_icon_exec = $(top_srcdir)/build/icon-theme-installer -t $(theme) -s $(srcdir) -d "x$(DESTDIR)" -b $(themedir) -m "$(mkinstalldirs)" -x "$(INSTALL_DATA)" +# install-data-local: +# $(install_icon_exec) -i $(theme_icons) +# +# uninstall-hook: +# $(install_icon_exec) -u $(theme_icons) +# +# MAINTAINERCLEANFILES = Makefile.in +# EXTRA_DIST = $(wildcard *.svg *.png) +# --------------- +# +# Arguments to this program: +# +# -i : Install +# -u : Uninstall +# -t : Theme name (hicolor) +# -b : Theme installation dest directory [x$(DESTDIR)] - Always prefix +# this argument with x; it will be stripped but will act as a +# placeholder for zero $DESTDIRs (only set by packagers) +# -d : Theme installation directory [$(hicolordir)] +# -s : Source directory [$(srcdir)] +# -m : Command to exec for directory creation [$(mkinstalldirs)] +# -x : Command to exec for single file installation [$(INSTALL_DATA)] +# : All remainging should be category,filename pairs + +while getopts "iut:b:d:s:m:x:" flag; do + case "$flag" in + i) INSTALL=yes ;; + u) UNINSTALL=yes ;; + t) THEME_NAME=$OPTARG ;; + d) INSTALL_DEST_DIR=${OPTARG##x} ;; + b) INSTALL_BASE_DIR=$OPTARG ;; + s) SRC_DIR=$OPTARG ;; + m) MKINSTALLDIRS_EXEC=$OPTARG ;; + x) INSTALL_DATA_EXEC=$OPTARG ;; + esac +done + +shift $(($OPTIND - 1)) + +if test "x$INSTALL" = "xyes" -a "x$UNINSTALL" = "xyes"; then + echo "Cannot pass both -i and -u" + exit 1 +elif test "x$INSTALL" = "x" -a "x$UNINSTALL" = "x"; then + echo "Must path either -i or -u" + exit 1 +fi + +if test -z "$THEME_NAME"; then + echo "Theme name required (-t hicolor)" + exit 1 +fi + +if test -z "$INSTALL_BASE_DIR"; then + echo "Base theme directory required [-d \$(hicolordir)]" + exit 1 +fi + +if test ! -x $(echo "$MKINSTALLDIRS_EXEC" | cut -f1 -d' '); then + echo "Cannot find '$MKINSTALLDIRS_EXEC'; You probably want to pass -m \$(mkinstalldirs)" + exit 1 +fi + +if test ! -x $(echo "$INSTALL_DATA_EXEC" | cut -f1 -d' '); then + echo "Cannot find '$INSTALL_DATA_EXEC'; You probably want to pass -x \$(INSTALL_DATA)" + exit 1 +fi + +if test -z "$SRC_DIR"; then + SRC_DIR=. +fi + +for icon in $@; do + size=$(echo $icon | sed s/[^0-9]*//g) + category=$(echo $icon | cut -d, -f1) + build_name=$(echo $icon | cut -d, -f2) + install_name=$(echo $build_name | sed "s/[0-9]//g; s/-\././") + install_name=$(basename $install_name) + + if test -z $size; then + size=scalable; + else + size=${size}x${size}; + fi + + install_dir=${INSTALL_DEST_DIR}${INSTALL_BASE_DIR}/$size/$category + install_path=$install_dir/$install_name + + if test "x$INSTALL" = "xyes"; then + echo "Installing $size $install_name into $THEME_NAME icon theme" + + $($MKINSTALLDIRS_EXEC $install_dir) || { + echo "Failed to create directory $install_dir" + exit 1 + } + + $($INSTALL_DATA_EXEC $SRC_DIR/$build_name $install_path) || { + echo "Failed to install $SRC_DIR/$build_name into $install_path" + exit 1 + } + + if test ! -e $install_path; then + echo "Failed to install $SRC_DIR/$build_name into $install_path" + exit 1 + fi + else + if test -e $install_path; then + echo "Removing $size $install_name from $THEME_NAME icon theme" + + rm $install_path || { + echo "Failed to remove $install_path" + exit 1 + } + fi + fi +done + +if test "x$INSTALL" = "xyes"; then + gtk_update_icon_cache_bin="$((which gtk-update-icon-cache || echo /opt/gnome/bin/gtk-update-icon-cache)2>/dev/null)" + gtk_update_icon_cache="$gtk_update_icon_cache_bin -f -t $INSTALL_BASE_DIR" + + if test -z "$INSTALL_DEST_DIR"; then + if test -x $gtk_update_icon_cache_bin; then + echo "Updating GTK icon cache" + $gtk_update_icon_cache + else + echo "*** Icon cache not updated. Could not execute $gtk_update_icon_cache_bin" + fi + else + echo "*** Icon cache not updated. After install, run this:" + echo "*** $gtk_update_icon_cache" + fi +fi +