From 48adde227efe9e28d4727a6379291bad987bdb94 Mon Sep 17 00:00:00 2001
From: Matteo Rossini <info@slakfinder.org>
Date: Tue, 11 Jan 2022 22:06:07 +0100
Subject: [PATCH] Tue Jan 11 21:42:33 CET 2022
 pkg/slackpkg+-1.7.11-noarch-2mt.txz:   - Automatically download gpg key if
 needed if STRICTGPG=on.     If STRICTGPG=off you need to manually run
 slackpkg update gpg every     time you add a new repository.
 +-------------------------+

updated documentation
---
 ChangeLog.txt       |  7 +++++++
 src/CHANGES         |  3 +++
 src/ChangeLog.txt   |  7 +++++++
 src/README          | 17 ++++++++++++++---
 src/slackpkgplus.sh | 16 ++++++++--------
 5 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index fa92d27..4e254a6 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,10 @@
+Tue Jan 11 21:42:33 CET 2022
+pkg/slackpkg+-1.7.11-noarch-2mt.txz:
+  - Automatically download gpg key if needed if STRICTGPG=on.
+    If STRICTGPG=off you need to manually run slackpkg update gpg every
+    time you add a new repository.
++-------------------------+
+
 Tue Jan 11 19:24:04 CET 2022
 pkg/slackpkg+-1.7.11-noarch-1mt.txz:
   - zlookkernel.sh also supports grub (thanks to RezaT4795)
diff --git a/src/CHANGES b/src/CHANGES
index 3718022..1a8ead6 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -127,6 +127,9 @@
 
 *Various
 
+- No longer need to run 'slackpkg update gpg' everytime a repository is added or
+  renamed, unless STRICTGPG=off
+
 - Suppress wget output in ChangeLog downloading
 
 - Catch errors and return exit status: 1 for warning, 2 for fatal
diff --git a/src/ChangeLog.txt b/src/ChangeLog.txt
index fa92d27..4e254a6 100644
--- a/src/ChangeLog.txt
+++ b/src/ChangeLog.txt
@@ -1,3 +1,10 @@
+Tue Jan 11 21:42:33 CET 2022
+pkg/slackpkg+-1.7.11-noarch-2mt.txz:
+  - Automatically download gpg key if needed if STRICTGPG=on.
+    If STRICTGPG=off you need to manually run slackpkg update gpg every
+    time you add a new repository.
++-------------------------+
+
 Tue Jan 11 19:24:04 CET 2022
 pkg/slackpkg+-1.7.11-noarch-1mt.txz:
   - zlookkernel.sh also supports grub (thanks to RezaT4795)
diff --git a/src/README b/src/README
index 0c4d70b..b166ae4 100644
--- a/src/README
+++ b/src/README
@@ -143,6 +143,18 @@ accepts the following kinds of argument:
    Note: 'slackpkg install .' is an alias of 'slackpkg install dir:./', but
    'slackpkg install ./' is NOT the same alias; see FILE in man slackpkg
 
+8) "comma syntax". Add a comma to the package name in any command to match
+   exact package name instead word match. For example, searching for
+   "libreoffice" match "libreoffice" "libreoffice-dict-it" etc. Up to 500
+   packages that you need to deselect if you just want to install libreoffice
+       slackpkg upgrade libreoffice,
+       slackpkg install alienbob:libreoffice,
+       slackpkg download libreoffice,
+       slackpkg search libreoffice,
+   you can also put the comma at the start of the packagename
+       slackpkg reinstall ,libreoffice
+       slackpkg install ,libreoffice{,-dict-it,-l10n-it}
+
 -----
 
 
@@ -610,9 +622,8 @@ To use a similar repository you may set STRICTGPG=off
 Note that sometime you may need to import manually the GPG-KEY with the command
 # gpg --import GPG-KEY
 
-Note: after upgrading from slackpkg+ < 1.7, you must run slackpkg update gpg.
-Also you need it everytime you add or _rename_ a reporitory in
-slackpkgplus.conf.
+Note: If you add a repository you may need to run 'slackpkg update gpg' if
+STRICTGPG is set to off.
 
 -----
 
diff --git a/src/slackpkgplus.sh b/src/slackpkgplus.sh
index c0b92fc..8c7ec50 100755
--- a/src/slackpkgplus.sh
+++ b/src/slackpkgplus.sh
@@ -1994,14 +1994,14 @@ if [ "$SLACKPKGPLUS" = "on" ];then
     find $TEMP ! -type d|sort|tac|awk '{if($1~/\.asc$/)f[$1]++;if($1~/\.t.z$/ && !f[$1".asc"])print $1}' |xargs -r rm -f
   fi
 
-  if [ "$UPARG" != "gpg" ]&&[ "$CHECKGPG" = "on" ]&& ! ls -l $WORKDIR/gpg/GPG-KEY-slackware*.gpg >/dev/null 2>&1;then
-    echo "FATAL! No Slackware GPG-KEY imported."
-    if [ -e "$WORKDIR/ChangeLog.txt" ];then
-      echo "If you are upgrading from an older release of slackpkg+, all keys must to be reimported."
-    fi
-    echo "Please run"
-    echo "  # slackpkg update gpg"
-    cleanup
+  #if [ "$UPARG" != "gpg" ]&&[ "$CHECKGPG" = "on" ]&&[ "$STRICTGPG" = "on" ] && ! ls -l $WORKDIR/gpg/GPG-KEY-slackware*.gpg >/dev/null 2>&1;then
+  if [ "$UPARG" != "gpg" ]&&[ "$CHECKGPG" = "on" ]&&[ "$STRICTGPG" = "on" ];then
+    ls -l $WORKDIR/gpg/GPG-KEY-slackware*.gpg >/dev/null 2>&1 || GPGFIRSTTIME=0
+    for PREPO in "${!MIRRORPLUS[@]}" ; do
+      if ! echo "${MIRRORPLUS[$PREPO]}"|grep -q -e "^httpdir://" -e "^httpsdir://" -e "^ftpdir://" 2>/dev/null ; then
+        ls -l $WORKDIR/gpg/GPG-KEY-${PREPO}.gpg >/dev/null 2>&1 || GPGFIRSTTIME=0
+      fi
+    done
   fi
 
     # Ensure each repository url has a trailing slash...