4 files changed, 44 insertions, 41 deletions
diff --git a/network/zoom-linux/doinst.sh b/network/zoom-linux/doinst.sh
index 408a29c514..9a8ded3c60 100644
--- a/network/zoom-linux/doinst.sh
+++ b/network/zoom-linux/doinst.sh
@@ -1,10 +1,3 @@
-( cd usr/bin ; rm -rf zoom-linux )
-( cd usr/bin ; ln -sf /opt/zoom-linux/ZoomLauncher zoom-linux )
-
-if [ -x /usr/bin/xdg-mime ]; then
-    /usr/bin/xdg-mime install /usr/share/mime/packages/zoom-linux.xml
-fi
-
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
@@ -12,9 +5,3 @@ fi
 if [ -x /usr/bin/update-mime-database ]; then
   /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
 fi
-
-if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
-  if [ -x /usr/bin/gtk-update-icon-cache ]; then
-    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
-  fi
-fi
diff --git a/network/zoom-linux/zoom-linux.SlackBuild b/network/zoom-linux/zoom-linux.SlackBuild
index fb00632b2d..ed7813e375 100644
--- a/network/zoom-linux/zoom-linux.SlackBuild
+++ b/network/zoom-linux/zoom-linux.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for zoom-linux
 #
-# Copyright 2018-2020 Ebben Aries <e@dscp.org>
+# Copyright 2018-2023 Ebben Aries <slackbuilds@dscp.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,11 +22,14 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=zoom-linux
+VERSION=${VERSION:-6.0.2.4680} # may be overridden by source!
 SRCNAM=zoom
-VERSION=${VERSION:-3.5.374815.0324}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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}
@@ -61,10 +71,12 @@ set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$SRC.tar.xz
-cd $SRCNAM
+cd $PKG
+tar xvf $CWD/$SRC.pkg.tar.xz
+# don't want these
+rm -vrf .INSTALL .MTREE .PKGINFO
+rm -rf usr/bin/zoom usr/share/doc
+
 chown -R root:root .
 find -L . \
 \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -72,25 +84,30 @@ find -L . \
 \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-mkdir -p $PKG/opt/$PRGNAM
-cp -a * $PKG/opt/$PRGNAM
+cd $PKG/usr/bin
+ln -sf ../../opt/zoom/ZoomLauncher zoom-linux
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+# remove old stuff that might be confused with games/zoom
+rm -fv $PKG/usr/share/applications/Zoom.desktop
+rm -fv $PKG/usr/share/mime/packages/zoom.xml
+rm -fv $PKG/usr/share/pixmaps/Zoom.png
 
-mkdir -p $PKG/usr/share/applications/
-install -D -m644 $CWD/zoom-linux.desktop $PKG/usr/share/applications/
+# add our own files
+install -m 0644 $CWD/zoom-linux.desktop -t $PKG/usr/share/applications/
+install -m 0644 $CWD/zoom-linux.png -t $PKG/usr/share/pixmaps/
+install -m 0644 $CWD/zoom-linux.xml -t $PKG/usr/share/mime/packages/
 
-mkdir -p $PKG/usr/share/pixmaps/
-cp $CWD/zoom-linux.png $PKG/usr/share/pixmaps/
-cp $CWD/application-x-zoom.png $PKG/usr/share/pixmaps/
+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
 
-mkdir -p $PKG/usr/share/mime/packages/
-cp $CWD/zoom-linux.xml $PKG/usr/share/mime/packages/
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $CWD/README $PKG/usr/doc/$PRGNAM-$VERSION
+chown root:root $PKG/usr/doc/$PRGNAM-$VERSION/README
+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
diff --git a/network/zoom-linux/zoom-linux.desktop b/network/zoom-linux/zoom-linux.desktop
index 78f2426252..84dc0a257a 100644
--- a/network/zoom-linux/zoom-linux.desktop
+++ b/network/zoom-linux/zoom-linux.desktop
@@ -5,8 +5,7 @@ Exec=/usr/bin/zoom-linux %U
 Icon=zoom-linux
 Terminal=false
 Type=Application
-Encoding=UTF-8
-Categories=Network;Application;
+Categories=Network;
 StartupWMClass=zoom
 MimeType=x-scheme-handler/zoommtg;application/x-zoom;
 X-KDE-Protocols=zoommtg
diff --git a/network/zoom-linux/zoom-linux.info b/network/zoom-linux/zoom-linux.info
index 7591e6a385..5bdc183dd8 100644
--- a/network/zoom-linux/zoom-linux.info
+++ b/network/zoom-linux/zoom-linux.info
@@ -1,10 +1,10 @@
 PRGNAM="zoom-linux"
-VERSION="3.5.374815.0324"
+VERSION="6.0.2.4680"
 HOMEPAGE="https://www.zoom.us/"
-DOWNLOAD="https://www.zoom.us/client/3.5.374815.0324/zoom_i686.tar.xz"
-MD5SUM="725bc58490a641619c6f4847ae968fc7"
-DOWNLOAD_x86_64="https://www.zoom.us/client/3.5.374815.0324/zoom_x86_64.tar.xz"
-MD5SUM_x86_64="49fcd551dfec92f1ba359ca89ed5455e"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://cdn.zoom.us/prod/6.0.2.4680/zoom_x86_64.pkg.tar.xz"
+MD5SUM_x86_64="0e46a93bc0f450ec551489d8a639ea46"
 REQUIRES=""
 MAINTAINER="Ebben Aries"
-EMAIL="e@dscp.org"
+EMAIL="slackbuilds@dscp.org"