From 05f0a7b137b28fbcaac6a2f9804f09beb439d998 Mon Sep 17 00:00:00 2001
From: "B. Watson" <yalhcru@gmail.com>
Date: Mon, 4 Apr 2022 19:42:36 -0400
Subject: ham/baudline: Actually set ARCH.

Signed-off-by: B. Watson <yalhcru@gmail.com>
---
 ham/baudline/baudline.SlackBuild | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

(limited to 'ham/baudline')

diff --git a/ham/baudline/baudline.SlackBuild b/ham/baudline/baudline.SlackBuild
index a91d8d66d0..d715a5dd2d 100644
--- a/ham/baudline/baudline.SlackBuild
+++ b/ham/baudline/baudline.SlackBuild
@@ -20,23 +20,34 @@
 # see fit. Or as I see fit. Or as I fit. Although
 # that is unlikely, as I am rather tall.
 
+# 20220301 bkw: Modified by SlackBuilds.org, BUILD=3:
+# - actually set ARCH. makepkg was creating a package called
+#   baudline-1.08--2_SBo.tgz, which is bad, mmm'kay?
+# note: .desktop file validates, but with a hint (basically a minor
+# warning). not going to mess with it for now.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=baudline
 VERSION=${VERSION:-1.08}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
-case "${ARCH:-$(uname -m)}" in
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+case "$ARCH" in
     i?86)   SRCARCH=i686;   ARCHDIR=x86    ;;
     x86_64) SRCARCH=x86_64; ARCHDIR=x86_64 ;;
     *) echo "$ARCH is not supported"; exit 1 ;;
 esac
 
-# 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
@@ -57,9 +68,9 @@ cd ${PRGNAM}_${VERSION}_linux_${ARCHDIR}
 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/bin
 install -m 755 baudline $PKG/usr/bin
@@ -84,7 +95,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a README_unix.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-find $PKG/usr/doc -type f -exec chmod 644 {} \;
+find $PKG/usr/doc -type f -exec chmod 644 {} \+
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-- 
cgit v1.2.3-65-gdbad