From 211389dae1332136eac9dda031ee3ee90c3900b7 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Wed, 12 May 2021 11:03:17 -0400 Subject: [PATCH] 2021-05-12 Fred Gleason * Added code to update the desktop icon cache to the 'make install' target. Signed-off-by: Fred Gleason --- ChangeLog | 3 +++ icons/Makefile.am | 4 +++- icons/update_icons.sh | 30 ++++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100755 icons/update_icons.sh diff --git a/ChangeLog b/ChangeLog index 71f66eff..83a7cc2e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21678,3 +21678,6 @@ 2021-05-11 Fred Gleason * Fixed a regression in rdcastmanager(1) that caused values in the 'Superfeed' column of the Feed List to be inverted. +2021-05-12 Fred Gleason + * Added code to update the desktop icon cache to the 'make install' + target. diff --git a/icons/Makefile.am b/icons/Makefile.am index b8fdb3d7..883a25bb 100644 --- a/icons/Makefile.am +++ b/icons/Makefile.am @@ -186,6 +186,7 @@ install-exec-am: mkdir -p $(DESTDIR)@prefix@/share/X11/fvwm2/pixmaps cp rivendell-16x16.xpm $(DESTDIR)@prefix@/share/X11/fvwm2/pixmaps/mini.rivendell.xpm cp rivendell-32x32.xpm $(DESTDIR)@prefix@/share/X11/fvwm2/pixmaps/rivendell.xpm + ./update_icons.sh uninstall-local: rm -f $(DESTDIR)@libexecdir@/donut-spinner.gif @@ -267,7 +268,7 @@ uninstall-local: rm -f $(DESTDIR)@prefix@/share/icons/hicolor/128x128/apps/rdpanel-128x128.png rm -f $(DESTDIR)@prefix@/share/icons/hicolor/256x256/apps/rdpanel.png rm -f $(DESTDIR)@prefix@/share/icons/hicolor/512x512/apps/rdpanel.png - + ./update_icons.sh EXTRA_DIST = admin.xpm\ blueball.png\ @@ -490,6 +491,7 @@ EXTRA_DIST = admin.xpm\ trashcan-16x16.xpm\ trashcan-32x32.png\ trashcan-32x32.xpm\ + update_icons.sh\ upload.xpm\ user.xpm\ webget_logo.png\ diff --git a/icons/update_icons.sh b/icons/update_icons.sh new file mode 100755 index 00000000..5ff47e36 --- /dev/null +++ b/icons/update_icons.sh @@ -0,0 +1,30 @@ +#!/bin/bash + +# update_icons.sh +# +# Update icon cache. +# +# (C) Copyright 2021 Fred Gleason +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# + +if test $UID = 0 ; then + if test -x /usr/bin/gtk-update-icon-cache ; then + /usr/bin/gtk-update-icon-cache -f /usr/share/icons/hicolor + fi +fi + +# End of update_icons.sh