system/unetbootin: Fix icon perms and .desktop.

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

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

1 files changed, 14 insertions, 9 deletions

diff --git a/system/unetbootin/unetbootin.SlackBuild b/system/unetbootin/unetbootin.SlackBuild
index 031b530092174..89e5356db39a2 100644
--- a/system/unetbootin/unetbootin.SlackBuild
+++ b/system/unetbootin/unetbootin.SlackBuild
@@ -11,11 +11,15 @@
 # v661: (jw) version bump to 661 29 July 2018 / take sources from github.com as the sourceforge page seems to be somehow obsolete
 # v677: (SBo) version bump to 677 14 April 2020
 
+# 20220414 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - fix icon permissions.
+# - make .desktop file validate.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=unetbootin
 VERSION=${VERSION:-702}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -27,9 +31,6 @@ 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
@@ -65,9 +66,12 @@ tar xvf $CWD/${PRGNAM}-source-$(echo $VERSION).tar.gz
 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 {} \+
+
+# 20220414 bkw: the above doesn't quite fix the permissions in the tarball.
+chmod 644 *.png *.svg *.desktop
 
 lupdate-qt5 unetbootin.pro
 lrelease-qt5 unetbootin.pro
@@ -80,6 +84,9 @@ cp -a $PTMP/$PRGNAM $PKG/usr/bin/$PRGNAM
 cp -a $PTMP/unetbootin_asroot $PKG/usr/bin/
 chmod 755 $PKG/usr/bin/unetbootin_asroot
 
+sed -i -e '/^Cat/s,Application;,,' \
+       -e '/^GenericName/s,\[en_US\],,' \
+       $PTMP/$PRGNAM.desktop
 mkdir -p $PKG/usr/share/applications
 cp -a $PTMP/$PRGNAM.desktop  $PKG/usr/share/applications/$PRGNAM.desktop
 
@@ -97,13 +104,11 @@ done
 mkdir -p $PKG/usr/share/icons/hicolor/scalable/apps/
 cp -a $PTMP/unetbootin_icons.svg $PKG/usr/share/icons/hicolor/scalable/apps/$PRGNAM.svg
 
-find $PKG/usr/share/icons -type f -exec chmod 0644 {} \;
-
 mkdir -p $PKG/usr/share/pixmaps/
 cp -a $PTMP/unetbootin_icons.svg $PKG/usr/share/pixmaps/$PRGNAM.svg
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README.TXT INSTALL  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.TXT $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 cat $CWD/README.issues > $PKG/usr/doc/$PRGNAM-$VERSION/README.issues