python/python3-fontPens: Fix PRGNAM in script and info file.

Signed-off-by: B. Watson <yalhcru@gmail.com>

2 files changed, 20 insertions, 17 deletions

diff --git a/python/python3-fontPens/python3-fontPens.SlackBuild b/python/python3-fontPens/python3-fontPens.SlackBuild
index 09446ecf14..64488d3eb6 100644
--- a/python/python3-fontPens/python3-fontPens.SlackBuild
+++ b/python/python3-fontPens/python3-fontPens.SlackBuild
@@ -22,10 +22,16 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220309 bkw: Modified by SlackBuilds.org:
+# - once again, PRGNAM *has to* match the directory and SlackBuild name,
+#   and PKGNAM must be avoided because it makes the script hard for
+#   human to read (PKGNAM and PRGNAM look very similar).
+# - also, PRGNAM in the .info file has to match the directory name.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
-PRGNAM=fontPens
-PKGNAM=python3-fontPens
+PRGNAM=python3-fontPens
+SRCNAM=fontPens
 VERSION=${VERSION:-0.2.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -39,16 +45,13 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# 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 "$PKGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
 fi
 
 TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PKGNAM
+PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 set -e
@@ -56,24 +59,24 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-unzip $CWD/$PRGNAM-$VERSION.zip
-cd $PRGNAM-$VERSION
+rm -rf $SRCNAM-$VERSION
+unzip $CWD/$SRCNAM-$VERSION.zip
+cd $SRCNAM-$VERSION
 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 \
+  -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 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 python3 setup.py install --root=$PKG
 
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a README.rst LICENSE.txt $PKG/usr/doc/$PKGNAM-$VERSION
-cat $CWD/$PKGNAM.SlackBuild > $PKG/usr/doc/$PKGNAM-$VERSION/$PKGNAM.SlackBuild
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.rst LICENSE.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PKGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/python/python3-fontPens/python3-fontPens.info b/python/python3-fontPens/python3-fontPens.info
index c9e3014e56..c9ea7327c0 100644
--- a/python/python3-fontPens/python3-fontPens.info
+++ b/python/python3-fontPens/python3-fontPens.info
@@ -1,4 +1,4 @@
-PRGNAM="fontPens"
+PRGNAM="python3-fontPens"
 VERSION="0.2.4"
 HOMEPAGE="https://pypi.org/project/fontPens/"
 DOWNLOAD="https://files.pythonhosted.org/packages/e8/25/ad6b67e7c1e00798ceac95f0cb3abfb82f83f6373e553caf4976855c534f/fontPens-0.2.4.zip"