diff --git a/system/oldschool-pc-fonts/doinst.sh b/system/oldschool-pc-fonts/doinst.sh index 4d463758c8..7e3c5f0234 100644 --- a/system/oldschool-pc-fonts/doinst.sh +++ b/system/oldschool-pc-fonts/doinst.sh @@ -9,6 +9,9 @@ if [ -x /usr/bin/mkfontdir -a -x /usr/bin/mkfontscale ]; then /usr/bin/mkfontdir . ) fi + +[ "$DISPLAY" != "" ] && xset fp rehash 2>/dev/null + if [ -x /usr/bin/fc-cache ]; then /usr/bin/fc-cache -f fi diff --git a/system/oldschool-pc-fonts/oldschool-pc-fonts.SlackBuild b/system/oldschool-pc-fonts/oldschool-pc-fonts.SlackBuild index 7d43a6c7fd..bf44c7de08 100644 --- a/system/oldschool-pc-fonts/oldschool-pc-fonts.SlackBuild +++ b/system/oldschool-pc-fonts/oldschool-pc-fonts.SlackBuild @@ -24,6 +24,8 @@ # Now maintained by B. Watson +# 20230307 bkw: BUILD=2, add douninst.sh. + # 20201207 bkw: # - Update for v2.2. Enough changes that we can't build the old version with # the modified script. @@ -42,7 +44,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=oldschool-pc-fonts VERSION=${VERSION:-2.2} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -138,6 +140,7 @@ sed "s,@TYPE@,$TYPE," $CWD/slack-desc > $PKG/install/slack-desc # actually included. if [ "$TTF" = "yes" ]; then cat $CWD/doinst.sh > $PKG/install/doinst.sh + cp $PKG/install/doinst.sh $PKG/install/douninst.sh fi cd $PKG