From 2c47d5927cfa73aebd6c22d30b3040b934d651a1 Mon Sep 17 00:00:00 2001
From: B. Watson
Date: Sat, 9 Apr 2022 13:00:59 -0400
Subject: system/conky: Fix doinst.sh.

Signed-off-by: B. Watson <yalhcru@gmail.com>
---
 system/conky/conky.SlackBuild | 11 +++++------
 system/conky/doinst.sh        | 13 ++++++++++---
 2 files changed, 15 insertions(+), 9 deletions(-)

(limited to 'system/conky')

diff --git a/system/conky/conky.SlackBuild b/system/conky/conky.SlackBuild
index 373cdd5615..790a1c11f6 100644
--- a/system/conky/conky.SlackBuild
+++ b/system/conky/conky.SlackBuild
@@ -22,11 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220409 bkw: Modified by SlackBuilds.org, BUILD=2: fix doist.sh.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=conky
 VERSION=${VERSION:-1.12.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -38,9 +40,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -93,9 +92,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 # fix MANDIR
 sed -i 's,share/man/man1,man/man1,g' CMakeLists.txt
diff --git a/system/conky/doinst.sh b/system/conky/doinst.sh
index ffd3d4ab11..8945a41fc0 100644
--- a/system/conky/doinst.sh
+++ b/system/conky/doinst.sh
@@ -1,14 +1,21 @@
 config() {
   NEW="$1"
   OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
   if [ ! -r $OLD ]; then
     mv $NEW $OLD
   elif [ "$(cat $OLD|md5sum)" = "$(cat $NEW|md5sum)" ]; then
-    # toss the redundant copy
     rm $NEW
   fi
-  # Otherwise, we leave the .new copy for the admin to consider...
 }
 config etc/conky/conky.conf.new
 config etc/conky/conky_no_x11.conf.new
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
-- 
cgit v1.2.3