From 1e1ce4a9a8ecbef6b37feedad4bd8bce05397eda Mon Sep 17 00:00:00 2001 From: Andrew Clemons Date: Sat, 12 Mar 2022 13:23:00 +1300 Subject: [PATCH] python/python3-fs: Fix PRGNAM usage. Don't introduce new things like PKGNAM. Signed-off-by: Andrew Clemons --- python/python3-fs/python3-fs.SlackBuild | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/python/python3-fs/python3-fs.SlackBuild b/python/python3-fs/python3-fs.SlackBuild index 1af77e1f92..9db6a4cbda 100644 --- a/python/python3-fs/python3-fs.SlackBuild +++ b/python/python3-fs/python3-fs.SlackBuild @@ -23,8 +23,8 @@ cd $(dirname $0) ; CWD=$(pwd) -PRGNAM=fs -PKGNAM=python3-fs +PRGNAM=python3-fs +SRCNAM=${PRGNAM#python3-*} VERSION=${VERSION:-2.4.15} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -42,12 +42,12 @@ fi # 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 +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} set -e @@ -55,9 +55,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.gz +cd $SRCNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -67,12 +67,12 @@ find -L . \ python3 setup.py install --root=$PKG -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a README.md LICENSE $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.md LICENSE $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