From 3f7e2ce61ecc52119dc33bc0ed8afbb53cacd528 Mon Sep 17 00:00:00 2001 From: Dave Woodfall Date: Wed, 9 Mar 2022 18:02:55 +0000 Subject: [PATCH] graphics/fontforge: Update the pre-install catcher. Signed-off-by: Dave Woodfall Signed-off-by: Andrew Clemons --- graphics/fontforge/fontforge.SlackBuild | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/graphics/fontforge/fontforge.SlackBuild b/graphics/fontforge/fontforge.SlackBuild index e811f37a5c..e69e132623 100644 --- a/graphics/fontforge/fontforge.SlackBuild +++ b/graphics/fontforge/fontforge.SlackBuild @@ -44,9 +44,14 @@ FREETYPE=${FREETYPE:-2.11.1} GNULIB=${GNULIB:-0.1} UTHASH=${UTHASH:-2.3.0} -if [ -f "$( echo /var/lib/pkgtools/packages/$PRGNAM-*-*-* )" ]; then - echo "Please uninstall any previous versions of $PRGNAM first." - echo "Exiting." +# This ought to be more reliable than testing if a package DB file +# exists. A little convoluted perhaps. +if $PRGNAM -v 2>/dev/null | + sed -n "s,^\($PRGNAM .*\),Found existing installation:\n \n\1,p + n;p;a\ " | grep -v "^$"; then + + echo "Please uninstall any previous versions of $PRGNAM before building +a new one." exit 1 fi