aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB. Watson <urchlay@slackware.uk>2023-03-08 01:32:26 -0500
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2023-03-12 08:48:27 +0700
commit7d0876d71fb1acd7999fcd9c61f95e28b87acd81 (patch)
tree9da57e2b126314c543f2be970d4e74ae14c0794b
parentae3ec6324b49d7d3ae7cdc84cb0304d6d0ed44d3 (diff)
games/xroar: Clean up douninst.sh.
Signed-off-by: B. Watson <urchlay@slackware.uk> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--games/xroar/douninst.sh27
-rw-r--r--games/xroar/xroar.SlackBuild3
2 files changed, 15 insertions, 15 deletions
diff --git a/games/xroar/douninst.sh b/games/xroar/douninst.sh
index cc363b1b7165..bd5d05ef9946 100644
--- a/games/xroar/douninst.sh
+++ b/games/xroar/douninst.sh
@@ -1,17 +1,16 @@
-# 20211015 bkw: I was going to have a douninst.sh that runs
-# /usr/bin/install-info --delete /usr/info/xroar.info.gz /usr/info/dir
-# but this won't work because removepkg has already deleted
-# /usr/info/xroar.info.gz before it runs douninst.sh. And you can't
-# use install-info to remove stuff *by name* from /usr/info/dir;
-# the info file must actually exist.
-# So the script has to manually remove the entry from the info dir,
-# and the Emulators section if it's become empty.
+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/info/dir ]; then
- # Remove the entry first:
- sed -i '/^\* XRoar:/d' usr/info/dir
- # If the Emulators section is empty now, remove it too:
- if grep -A1 '^Emulators$' usr/info/dir | tail -1 | grep -q '^$'; then
- sed -i '/^Emulators$/,+1d' usr/info/dir
+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
+
+if [ -x /usr/bin/install-info -a -d usr/info ]; then
+ ( cd usr/info
+ rm -f dir
+ for i in *.info*; do /usr/bin/install-info $i dir 2>/dev/null; done
+ )
+fi
diff --git a/games/xroar/xroar.SlackBuild b/games/xroar/xroar.SlackBuild
index 5238552e0fba..f7b849462725 100644
--- a/games/xroar/xroar.SlackBuild
+++ b/games/xroar/xroar.SlackBuild
@@ -6,6 +6,7 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20230308 bkw: BUILD=2, de-uglify douninst.sh.
# 20230214 bkw: update for 1.3.1
# 20230109 bkw: update for 1.3
@@ -26,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=xroar
VERSION=${VERSION:-1.3.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}