From: fsLeg <fsleg@t-rg.ws>
Date: Sun, 14 Jul 2024 18:02:22 +0000 (+0300)
Subject: Even more cleanups
X-Git-Url: https://git.t-rg.ws/?a=commitdiff_plain;h=bbeabbc71ab6a6854e363d644af51a8cc04af672;p=slackbuilds.git

Even more cleanups
---

diff --git a/dart-sass/dart-sass.SlackBuild b/dart-sass/dart-sass.SlackBuild
index e3d461c..9d29f03 100755
--- a/dart-sass/dart-sass.SlackBuild
+++ b/dart-sass/dart-sass.SlackBuild
@@ -32,8 +32,8 @@ PKGTYPE=${PKGTYPE:-txz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH="ia32" ;;
-    x86_64*) ARCH="x64" ;;
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -46,13 +46,25 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   exit 0
 fi
 
+if [ "x86_64" != "${ARCH}" -a "i586" != "${ARCH}" ]; then
+  echo
+  echo "*************************************************************"
+  echo "It seems you are not running an x86 or x86_64 system."
+  echo "dart-sass binaries only support x86 and x86_64 architectures."
+  echo "*************************************************************"
+  echo
+  exit 1
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "x64" ]; then
+if [ "$ARCH" = "x86_64" ]; then
+  ARCHID="x64"
   LIBDIRSUFFIX="64"
-else
+elif [ "$ARCH" = "i586" ]; then
+  ARCHID="ia32"
   LIBDIRSUFFIX=""
 fi
 
@@ -64,12 +76,12 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 
-tar xvf $CWD/$PRGNAM-$VERSION-linux-$ARCH.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION-linux-$ARCHID.tar.gz
 cd $PRGNAM
-mkdir -p $PKG/usr/bin $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM
+#mkdir -p $PKG/usr/bin $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM
 sed -i "s/\/src\//\/..\/lib$LIBDIRSUFFIX\/$PRGNAM\//g" sass
-cp sass $PKG/usr/bin/
-cp src/dart src/sass.snapshot $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM/
+install -D -t $PKG/usr/bin/ sass
+install -D -t $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM/ src/dart src/sass.snapshot
 chown -R root:root $PKG
 find -L $PKG \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -77,7 +89,8 @@ find -L $PKG \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Stripping the binary makes it not work
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 # Copy program license into the package
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/fdpowermon/fdpowermon.SlackBuild b/fdpowermon/fdpowermon.SlackBuild
index 2eddc3e..9e14701 100755
--- a/fdpowermon/fdpowermon.SlackBuild
+++ b/fdpowermon/fdpowermon.SlackBuild
@@ -53,8 +53,8 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$PRGNAM-$VERSION
 mkdir -p $PKG/usr/bin $PKG/etc/$PRGNAM $PKG/usr/share/icons/oxygen/base/22x22/status
 cp fdpowermon $PKG/usr/bin/
 cp theme.cfg $PKG/etc/$PRGNAM/
diff --git a/gxkb/gxkb.SlackBuild b/gxkb/gxkb.SlackBuild
index 8fddd58..8ebd75d 100755
--- a/gxkb/gxkb.SlackBuild
+++ b/gxkb/gxkb.SlackBuild
@@ -122,6 +122,7 @@ install -Dm 644 $CWD/$PRGNAM.SlackBuild $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.Sl
 
 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
diff --git a/python-fido2/python-fido2.SlackBuild b/python-fido2/python-fido2.SlackBuild
index 6d50102..f885f3c 100755
--- a/python-fido2/python-fido2.SlackBuild
+++ b/python-fido2/python-fido2.SlackBuild
@@ -79,6 +79,9 @@ cp -aR \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+# Fix permissions
+chmod 644 $PKG/usr/doc/$PRGNAM-$VERSION/examples/server/poetry.lock
+
 # Copy udev rules
 mkdir -p $PKG/etc/udev/rules.d
 cat $CWD/70-u2f.rules > $PKG/etc/udev/rules.d/70-u2f.rules
diff --git a/saflashplayer/saflashplayer.SlackBuild b/saflashplayer/saflashplayer.SlackBuild
index 713223a..a0cc2d4 100755
--- a/saflashplayer/saflashplayer.SlackBuild
+++ b/saflashplayer/saflashplayer.SlackBuild
@@ -38,6 +38,14 @@ 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 "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 if [ "x86_64" != "${ARCH}" ]; then
   echo
   echo "*************************************************************"
@@ -48,14 +56,6 @@ if [ "x86_64" != "${ARCH}" ]; then
   exit 1
 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 "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -72,21 +72,24 @@ tar xvf $CWD/flash_player_sa_linux.x86_64.tar.gz
 mkdir -p $PKG/usr/bin $PKG/usr/share/applications
 mv flashplayer $PKG/usr/bin/saflashplayer
 cp -a $CWD/saflashplayer.desktop $PKG/usr/share/applications/com.adobe.flashplayer.desktop
+
+# Stripping the binary causes it to segfault
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -aR LGPL license.pdf $PKG/usr/doc/$PRGNAM-$VERSION/
+
 chown -R root:root $PKG
 find -L $PKG \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -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 {} \;
-
-# Stripping the binary causes it to segfault
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -aR LGPL license.pdf $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
diff --git a/yubikey-manager-qt/yubikey-manager-qt.SlackBuild b/yubikey-manager-qt/yubikey-manager-qt.SlackBuild
index 0451354..0050a97 100755
--- a/yubikey-manager-qt/yubikey-manager-qt.SlackBuild
+++ b/yubikey-manager-qt/yubikey-manager-qt.SlackBuild
@@ -109,6 +109,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 # Copy the slack-desc into ./install
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 # Make the package
 cd $PKG
diff --git a/yubikey-manager/yubikey-manager.SlackBuild b/yubikey-manager/yubikey-manager.SlackBuild
index f288dcc..ed788fe 100755
--- a/yubikey-manager/yubikey-manager.SlackBuild
+++ b/yubikey-manager/yubikey-manager.SlackBuild
@@ -74,7 +74,8 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 # Copy and compress man pages
-cp -aR man $PKG/usr/
+mkdir -p $PKG/usr/man
+cp -aR man $PKG/usr/man/man1
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
diff --git a/yubioath-desktop/yubioath-desktop.SlackBuild b/yubioath-desktop/yubioath-desktop.SlackBuild
index e5d4e29..c5546ea 100755
--- a/yubioath-desktop/yubioath-desktop.SlackBuild
+++ b/yubioath-desktop/yubioath-desktop.SlackBuild
@@ -33,12 +33,22 @@ PKGTYPE=${PKGTYPE:-txz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH="ia32" ;;
-    x86_64*) ARCH="x64" ;;
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
+if [ "x86_64" != "${ARCH}" ]; then  
+  echo
+  echo "*************************************************************"
+  echo "It seems you are not running a x86_64 system. Yubico"
+  echo "Authenticator only supports x86_64 architecture."
+  echo "*************************************************************"
+  echo
+  exit 1
+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.
@@ -80,16 +90,21 @@ find -L $PKG \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Stripping the binary makes it not work
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs chmod 755 || true
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 # Copy program license into the package
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README.adoc $PKG/usr/doc/$PRGNAM-$VERSION/
+install -m 644 README.adoc $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 # Copy the slack-desc into ./install
 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