3 files changed, 21 insertions, 10 deletions
diff --git a/development/squirrel-sql/squirrel-sql.SlackBuild b/development/squirrel-sql/squirrel-sql.SlackBuild
index a158ab46ed..4752984813 100644
--- a/development/squirrel-sql/squirrel-sql.SlackBuild
+++ b/development/squirrel-sql/squirrel-sql.SlackBuild
@@ -1,16 +1,26 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for squirrel-sql
 
 # Written by Dario Nicodemi dario.sbo@gmail.com
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=squirrel-sql
-VERSION=${VERSION:-4.0.0}
+VERSION=${VERSION:-4.6.0}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+# 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
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -34,7 +44,7 @@ find -L . \
 
 mkdir -p $PKG/opt/$PRGNAM
 cp -r . $PKG/opt/$PRGNAM
-rm -rf $PKG/opt/$PRGNAM/{addpath.bat,squirrel-sql.bat}
+rm -rf $PKG/opt/$PRGNAM/{mac,addpath.bat,squirrel-sql.bat,squirrel-sql-mac.sh}
 mkdir -p $PKG/usr/bin
 cat <<EOF > $PKG/usr/bin/squirrel-sql
 #!/bin/sh
@@ -56,4 +66,4 @@ 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/squirrel-sql/squirrel-sql.desktop b/development/squirrel-sql/squirrel-sql.desktop
index c6f85cebb1..3fed1364a7 100644
--- a/development/squirrel-sql/squirrel-sql.desktop
+++ b/development/squirrel-sql/squirrel-sql.desktop
@@ -4,8 +4,9 @@ Exec=squirrel-sql
 TryExec=squirrel-sql
 Icon=squirrel-sql
 Terminal=false
-Name=SQuirreL
+Name=SQuirreL SQL
 GenericName=SQL Client
+Comment=A graphical SQL client
 Categories=Development;
 Type=Application
 StartupNotify=false
diff --git a/development/squirrel-sql/squirrel-sql.info b/development/squirrel-sql/squirrel-sql.info
index 115a359e15..60a4f1b4a9 100644
--- a/development/squirrel-sql/squirrel-sql.info
+++ b/development/squirrel-sql/squirrel-sql.info
@@ -1,10 +1,10 @@
 PRGNAM="squirrel-sql"
-VERSION="4.0.0"
+VERSION="4.6.0"
 HOMEPAGE="http://squirrel-sql.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/project/squirrel-sql/1-stable/4.0.0-plainzip/squirrelsql-4.0.0-optional.zip"
-MD5SUM="0820428b8dd6754d50c8c8a4b60bd4a2"
+DOWNLOAD="https://github.com/squirrel-sql-client/squirrel-sql-stable-releases/releases/download/4.6.0-a_plainzip/squirrelsql-4.6.0-optional.zip"
+MD5SUM="4adb48cecd1a5305437acf2de42be404"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jdk"
+REQUIRES="zulu-openjdk17"
 MAINTAINER="Dario Nicodemi"
 EMAIL="dario.sbo@gmail.com"