summaryrefslogtreecommitdiffstats
path: root/system/univga-font
diff options
context:
space:
mode:
author B. Watson2019-12-24 15:18:59 +0100
committer Willy Sudiarto Raharjo2019-12-31 12:06:24 +0100
commitdcc93ee3c92bcff39afcf54395f8b1d87b04968a (patch)
treed0fd7d1e7f87eff1456f59e6d9a4227b157037ed /system/univga-font
parent481e2b420144a388d6548c4867175340ceb0cf63 (diff)
downloadslackbuilds-dcc93ee3c92bcff39afcf54395f8b1d87b04968a.tar.gz
system/univga-font: Update doinst.sh.
Signed-off-by: B. Watson <yalhcru@gmail.com>
Diffstat (limited to 'system/univga-font')
-rw-r--r--system/univga-font/doinst.sh5
-rw-r--r--system/univga-font/univga-font.SlackBuild11
2 files changed, 10 insertions, 6 deletions
diff --git a/system/univga-font/doinst.sh b/system/univga-font/doinst.sh
index 4316eac64c..11dff54efe 100644
--- a/system/univga-font/doinst.sh
+++ b/system/univga-font/doinst.sh
@@ -11,6 +11,11 @@ if [ -x /usr/bin/mkfontdir -a -x /usr/bin/mkfontscale ]; then
)
fi
+# If X is running...
+if [ "$DISPLAY" != "" ] && [ -x /usr/bin/xset ]; then
+ /usr/bin/xset fp rehash >/dev/null 2>&1
+fi
+
# Update the X font indexes:
if [ -x /usr/bin/fc-cache ]; then
/usr/bin/fc-cache -f
diff --git a/system/univga-font/univga-font.SlackBuild b/system/univga-font/univga-font.SlackBuild
index 8a4f44caa0..2cd2cb84e7 100644
--- a/system/univga-font/univga-font.SlackBuild
+++ b/system/univga-font/univga-font.SlackBuild
@@ -8,9 +8,11 @@
# VERSION taken from the datestamp of the tarball.
+# 20191224 bkw: BUILD=2, xset fp rehash in doinst.sh.
+
PRGNAM=univga-font
VERSION=${VERSION:-20021031}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
ARCH=noarch
@@ -32,11 +34,8 @@ rm -rf $DIRNAME
tar xvf $CWD/$TARNAME.tgz
cd $DIRNAME
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 \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
# modern perl needs a slight change to the bdf2psf.pl script, and modern
# psfaddtable has different options than whatever this was written for.