3 files changed, 46 insertions, 20 deletions
diff --git a/development/dbeaver-ce/dbeaver-ce.SlackBuild b/development/dbeaver-ce/dbeaver-ce.SlackBuild
index 1db8c1baeb..f469a1b7db 100644
--- a/development/dbeaver-ce/dbeaver-ce.SlackBuild
+++ b/development/dbeaver-ce/dbeaver-ce.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for dbeaver-ce
 
-# Copyright 2020 Joielechong <juansspy@gmail.com>, Jasper Hageraats <spycrowsoft@gmail.com>
-# Copyright 2014 Antonio Hernández Blas <hba.nihilismus@gmail.com>
+# Copyright 2023 Joielechong <juansspy@gmail.com>, Jasper Hageraats <spycrowsoft@gmail.com>
+# Copyright 2014 Antonio HernÃ¡ndez Blas <hba.nihilismus@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,12 +23,15 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-ORIGINAL_PRGNAM=dbeaver
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=dbeaver-ce
+ORIGINAL_PRGNAM=dbeaver
 
-VERSION=${VERSION:-7.3.0}
+VERSION=${VERSION:-24.0.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=${ARCH:-$(uname -m)}
 case "$ARCH" in
@@ -37,7 +40,14 @@ case "$ARCH" in
        *) echo "$ARCH is not supported"; exit 1 ;;
 esac
 
-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}
@@ -68,16 +78,28 @@ find -L . \
 DESKTOPPATH=/usr/share/dbeaver/
 NEWDESKTOPPATH=/opt/$PRGNAM/
 
-# Rewrite paths in .desktop file
-mv ${NEWDESTDIR}/${ORIGINAL_PRGNAM}.desktop ${NEWDESTDIR}/${ORIGINAL_PRGNAM}.desktop.orig
-sed "s~$DESKTOPPATH~$NEWDESKTOPPATH~" ${NEWDESTDIR}/${ORIGINAL_PRGNAM}.desktop.orig > ${NEWDESTDIR}/${ORIGINAL_PRGNAM}.desktop
-rm ${NEWDESTDIR}/${ORIGINAL_PRGNAM}.desktop.orig
-
-# Add dbeaver to KDE/GNOME/XFCE menu
-install -D -m 644 ${NEWDESTDIR}/${ORIGINAL_PRGNAM}.desktop \
-  ${PKG}/usr/share/applications/${PRGNAM}.desktop
+## Add dbeaver to KDE/GNOME/XFCE menu
+mkdir -p $PKG/usr/share/applications
+cat <<EOF > $PKG/usr/share/applications/$PRGNAM.desktop
+[Desktop Entry]
+Version=1.0
+Type=Application
+Terminal=false
+Name=dbeaver-ce
+GenericName=Universal Database Manager
+Comment=Universal Database Manager and SQL Client.
+Path=/opt/$PRGNAM
+Exec=/opt/$PRGNAM/$ORIGINAL_PRGNAM
+Icon=/opt/$PRGNAM/dbeaver.png
+Categories=IDE;Development
+StartupWMClass=DBeaver
+StartupNotify=true
+Keywords=Database;SQL;IDE;JDBC;ODBC;MySQL;PostgreSQL;Oracle;DB2;MariaDB
+MimeType=application/sql
+EOF
 
-install -D -m 644 ${NEWDESTDIR}/${ORIGINAL_PRGNAM}.png ${PKG}/usr/share/pixmaps/${ORIGINAL_PRGNAM}.png
+install -D -m 0644 ${NEWDESTDIR}/${ORIGINAL_PRGNAM}.png \
+  ${PKG}/usr/share/pixmaps/${ORIGINAL_PRGNAM}.png
 
 mkdir -p $PKG/usr/bin
 cat << EOF > $PKG/usr/bin/$PRGNAM
@@ -98,6 +120,7 @@ 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/development/dbeaver-ce/dbeaver-ce.info b/development/dbeaver-ce/dbeaver-ce.info
index d99d8b6508..e8c3544ef3 100644
--- a/development/dbeaver-ce/dbeaver-ce.info
+++ b/development/dbeaver-ce/dbeaver-ce.info
@@ -1,10 +1,10 @@
 PRGNAM="dbeaver-ce"
-VERSION="7.3.0"
+VERSION="24.0.2"
 HOMEPAGE="https://dbeaver.io"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://download.dbeaver.com/community/7.3.0/dbeaver-ce-7.3.0-linux.gtk.x86_64.tar.gz"
-MD5SUM_x86_64="252c8d5cafc00aa46ec8ec95096692f3"
-REQUIRES="jdk"
+DOWNLOAD_x86_64="https://github.com/dbeaver/dbeaver/releases/download/24.0.2/dbeaver-ce-24.0.2-linux.gtk.x86_64.tar.gz"
+MD5SUM_x86_64="8d798aedc7ae9b5995951edf826e9c3d"
+REQUIRES=""
 MAINTAINER="Joielechong"
 EMAIL="juansspy@gmail.com"
diff --git a/development/dbeaver-ce/doinst.sh b/development/dbeaver-ce/doinst.sh
new file mode 100644
index 0000000000..5fb28930db
--- /dev/null
+++ b/development/dbeaver-ce/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi