1 files changed, 20 insertions, 7 deletions
diff --git a/system/culmus/culmus.SlackBuild b/system/culmus/culmus.SlackBuild
index 687b1e6d80..d3d5da8a77 100644
--- a/system/culmus/culmus.SlackBuild
+++ b/system/culmus/culmus.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for culmus
 # Copyright 2012, Niv Ierushalmi, Haifa, Israel
@@ -24,14 +24,26 @@
 # This script does not build anything, it only repackages the culmus fonts
 # into a slackware package
 
+# 20220409 bkw: Modified by SlackBuilds.org, BUILD=4:
+# - ignore ARCH in environment (generally it's set to x86_64 or i686,
+#   which is wrong for this build).
+# - add SlackBuild to doc dir.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=culmus
 VERSION=${VERSION:-0.130}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH=noarch
 
-ARCH=${ARCH:-noarch}
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -47,9 +59,9 @@ cd $PRGNAM-$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 {} \+
 
 mkdir -p $PKG/usr/share/fonts/TTF/
 cp *.ttf $PKG/usr/share/fonts/TTF/
@@ -66,10 +78,11 @@ ln -sf ../conf.avail/61-culmus.conf $PKG/etc/fonts/conf.d
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a CHANGES GNU-GPL LICENSE LICENSE-BITSTREAM $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
 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