1 files changed, 30 insertions, 17 deletions
diff --git a/desktop/Qogir-icon-theme/Qogir-icon-theme.SlackBuild b/desktop/Qogir-icon-theme/Qogir-icon-theme.SlackBuild
index 87bf63f671..b409af884d 100644
--- a/desktop/Qogir-icon-theme/Qogir-icon-theme.SlackBuild
+++ b/desktop/Qogir-icon-theme/Qogir-icon-theme.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Qogir-icon-theme
 
@@ -22,14 +22,26 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220312 bkw: Modified by SlackBuilds.org. VERSION must be a
+# constant, because our validation scripts check the VERSION in the
+# script against the VERSION in the .info file, and they must match.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=Qogir-icon-theme
-VERSION=${VERSION:-2019_04_06}
+VERSION=${VERSION:-20201122}
+SRCVER=${SRCVER:-$( echo $VERSION | sed 's,\(....\)\(..\)\(..\),\1-\2-\3,' )}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+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}
@@ -39,11 +51,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-mkdir $PRGNAM-$VERSION
-cd $PRGNAM-$VERSION
-tar xvf $CWD/Qogir.tar.xz
-tar xvf $CWD/Qogir-dark.tar.xz
+rm -rf $PRGNAM-$SRCVER
+tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
+cd $PRGNAM-$SRCVER
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -52,21 +62,24 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 mkdir -p $PKG/usr/share/icons
-cp -a Qogir Qogir-dark \
-  $PKG/usr/share/icons
-rm -f $PKG/usr/share/icons/Qogir/icon-theme.cache \
-  $PKG/usr/share/icons/Qogir-dark/icon-theme.cache
+./install.sh --dest $PKG/usr/share/icons
+find $PKG/usr/share/icons \
+  \( -name AUTHORS -o -name COPYING -o -name icon-theme.cache \) -exec rm -f {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-mv $PKG/usr/share/icons/Qogir/AUTHORS \
-  $PKG/usr/share/icons/Qogir/COPYING \
+cp -a AUTHORS COPYING README.md \
   $PKG/usr/doc/$PRGNAM-$VERSION
-rm -f $PKG/usr/share/icons/Qogir-dark/AUTHORS \
-  $PKG/usr/share/icons/Qogir-dark/COPYING
 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/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+# 20200407 bkw: makepkg's symlink search and doinst.sh creation doesn't
+# scale well. This makes the build complete much faster, and create an
+# identical doinst.sh.
+find . -type l \
+  -printf '( cd %h ; rm -rf %f )\n( cd %h ; ln -sf %l %f )\n' -delete | \
+  sed 's,cd \./,cd ,' >> $PKG/install/doinst.sh
+
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE