4 files changed, 36 insertions, 31 deletions
diff --git a/system/AnonymousPro/AnonymousPro.SlackBuild b/system/AnonymousPro/AnonymousPro.SlackBuild
index 3b23762af0..6aa27a688f 100644
--- a/system/AnonymousPro/AnonymousPro.SlackBuild
+++ b/system/AnonymousPro/AnonymousPro.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for AnonymousPro
 
-# Copyright 2014-2015 Eugene M., <damagedone at gmx dot com>
+# Copyright 2014-2021 Eugene M., <damagedone at gmx dot com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,14 +22,25 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=AnonymousPro
-VERSION=${VERSION:-1.002}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1_002}
+DIR_NAME=${DIR_NAME:-1.002.001}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -41,14 +52,9 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 unzip $CWD/$PRGNAM-$VERSION.zip
-unzip $CWD/AnonymousProMinus-1.003.zip
 
-# Ugly hack
-mv -f $PRGNAM-$VERSION.001 $PRGNAM-$VERSION
+mv -f $PRGNAM-$DIR_NAME $PRGNAM-$VERSION
 mv $PRGNAM-$VERSION/FONTLOG.txt $PRGNAM-$VERSION/AnonymousPro_FONTLOG.txt
-mv -f AnonymousProMinus-1.003/*.* $PRGNAM-$VERSION
-mv $PRGNAM-$VERSION/FONTLOG.txt $PRGNAM-$VERSION/AnonymousProMinus_FONTLOG.txt
-rm -rf ._AnonymousPro-1.002.001 AnonymousProMinus-1.003
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -69,4 +75,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/AnonymousPro/AnonymousPro.info b/system/AnonymousPro/AnonymousPro.info
index ca0b989459..a40ba80c58 100644
--- a/system/AnonymousPro/AnonymousPro.info
+++ b/system/AnonymousPro/AnonymousPro.info
@@ -1,10 +1,8 @@
 PRGNAM="AnonymousPro"
-VERSION="1.002"
+VERSION="1_002"
 HOMEPAGE="https://www.marksimonson.com/fonts/view/anonymous-pro"
-DOWNLOAD="https://www.marksimonson.com/assets/content/fonts/AnonymousPro-1.002.zip \
-          https://www.marksimonson.com/assets/content/fonts/AnonymousProMinus-1.003.zip"
-MD5SUM="bb5141b20b9d69b3190be03e5706c8b7 \
-        16468f49e2a56f8e2ad39f09728391bd"
+DOWNLOAD="https://www.marksimonson.com/assets/content/fonts/AnonymousPro-1_002.zip"
+MD5SUM="aac53fb8fdb238e84072a94f5721bbec"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/AnonymousPro/README b/system/AnonymousPro/README
index 77b576baa5..59b7e7704b 100644
--- a/system/AnonymousPro/README
+++ b/system/AnonymousPro/README
@@ -1,7 +1,7 @@
-Anonymous Pro (2009) is a family of four fixed-width fonts designed with coding
-in  mind. Anonymous Pro features an international, Unicode-based character set,
-with support for most Western and Central European Latin-based languages, plus
-Greek and Cyrillic.
+Anonymous Pro (2009) is a family of four fixed-width fonts designed
+with coding in mind. Anonymous Pro features an international,
+Unicode-based character set, with support for most Western and Central
+European Latin-based languages, plus Greek and Cyrillic.
 
 Features:
 
@@ -9,8 +9,9 @@ Features:
 - Fixed width design;
 - Various computer keyboard symbols;
 - DOS box-drawing characters;
-- Extended language support for most Latin-based Western and Central European
-  languages, as well as Greek and Cyrillic.
+- Extended language support for most Latin-based Western and Central
+  European languages, as well as Greek and Cyrillic.
 
-There are two versions: Anonymous Pro and Anonymous Pro Minus. Anonymous Pro
-contains embedded bitmaps for smaller sizes, Anonymous Pro Minus does not.
+There are two versions: Anonymous Pro and Anonymous Pro
+Minus. Anonymous Pro contains embedded bitmaps for smaller sizes,
+Anonymous Pro Minus does not.
diff --git a/system/AnonymousPro/doinst.sh b/system/AnonymousPro/doinst.sh
index 883c47ac0a..f0ffee7710 100644
--- a/system/AnonymousPro/doinst.sh
+++ b/system/AnonymousPro/doinst.sh
@@ -1,10 +1,10 @@
 # Update the X font indexes:
+
 if [ -x /usr/bin/mkfontdir ]; then
-  ( cd /usr/share/fonts/TTF
-    mkfontscale .
-    mkfontdir .
+  ( cd usr/share/fonts/TTF
+    /usr/bin/mkfontscale .
+    /usr/bin/mkfontdir .
   )
-fi
-if [ -x /usr/bin/fc-cache ]; then
-  /usr/bin/fc-cache -f
+
+  [ -x /usr/bin/fc-cache ] && /usr/bin/fc-cache -f
 fi