From cea5330058c8c51ea0b62a374b1643531b4597d6 Mon Sep 17 00:00:00 2001
From: Matteo Rossini <info@slakfinder.org>
Date: Mon, 20 Dec 2021 00:12:27 +0100
Subject: [PATCH] Sun Dec 19 23:40:59 CET 2021
 pkg/slackpkg+-1.7.10-noarch-1mt.txz:   - According to slackpkg 15.0.9,
 automatically rebuild package lists if     missing or not build by slackpkg+
 +-------------------------+

---
 ChangeLog.txt       |  6 ++++++
 src/CHANGES         |  8 +++++++-
 src/ChangeLog.txt   |  6 ++++++
 src/doinst.sh       |  4 ++++
 src/slackpkgplus.sh | 17 ++++++++++++++++-
 5 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 427df1a..4acdaff 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,9 @@
+Sun Dec 19 23:40:59 CET 2021
+pkg/slackpkg+-1.7.10-noarch-1mt.txz:
+  - According to slackpkg 15.0.9, automatically rebuild package lists if
+    missing or not build by slackpkg+
++-------------------------+
+
 Tue Oct 26 10:10:23 CEST 2021
 pkg/slackpkg+-1.7.9-noarch-1mt.txz:
   - According to slackpkg 15.0.8 new exit codes was added in slackpkg+ too:
diff --git a/src/CHANGES b/src/CHANGES
index 98ced2e..007e718 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,6 +1,6 @@
 = Full Changes list =
 
-== From 1.7 to 1.7.9 ==
+== From 1.7 to 1.7.10 ==
 
 *Configuration file:
 
@@ -62,6 +62,12 @@
   IMPORTANT note: please do not use
       # slackpkg install-new && slackpkg upgrade-all
 
+- Rebuild pkglist database if it was not generated by slackpkg+. Avoid slackpkg
+  (starting 15.0.9) to autogenerate pkglist database skipping slackpkg+. 
+  This happen after a self upgrade of slackpkg. 
+  After a manual upgrade of slackpkg or a manual remove of pkglist database,
+  slackpkg will generate the pkglist skipping slackpkg+ then slackpkg+ will 
+  regenerate pkglist skipping slackpkg :)
 
 *Improvements
 
diff --git a/src/ChangeLog.txt b/src/ChangeLog.txt
index 427df1a..4acdaff 100644
--- a/src/ChangeLog.txt
+++ b/src/ChangeLog.txt
@@ -1,3 +1,9 @@
+Sun Dec 19 23:40:59 CET 2021
+pkg/slackpkg+-1.7.10-noarch-1mt.txz:
+  - According to slackpkg 15.0.9, automatically rebuild package lists if
+    missing or not build by slackpkg+
++-------------------------+
+
 Tue Oct 26 10:10:23 CEST 2021
 pkg/slackpkg+-1.7.9-noarch-1mt.txz:
   - According to slackpkg 15.0.8 new exit codes was added in slackpkg+ too:
diff --git a/src/doinst.sh b/src/doinst.sh
index 5e63eda..bf76d68 100644
--- a/src/doinst.sh
+++ b/src/doinst.sh
@@ -39,3 +39,7 @@ config etc/slackpkg/slackpkgplus.conf.new
 config etc/slackpkg/greylist.new
 config etc/slackpkg/notifymsg.conf.new
 
+if [ -d var/lib/slackpkg ];then
+  [ ! -e $WORKDIR/pkglist ]&&touch $WORKDIR/pkglist
+  [ ! -e $WORKDIR/CHECKSUMS.md5 ]&&touch $WORKDIR/CHECKSUMS.md5
+fi
diff --git a/src/slackpkgplus.sh b/src/slackpkgplus.sh
index d6c5305..af31664 100755
--- a/src/slackpkgplus.sh
+++ b/src/slackpkgplus.sh
@@ -239,6 +239,8 @@ if [ "$SLACKPKGPLUS" = "on" ];then
       echo
       echo "=============================================================================="
     fi
+    [ ! -e $WORKDIR/pkglist ]&&touch $WORKDIR/pkglist
+    [ ! -e $WORKDIR/CHECKSUMS.md5 ]&&touch $WORKDIR/CHECKSUMS.md5
     echo
     rm -f /var/lock/slackpkg.$$
     if [ $VERBOSE -lt 3 -a -z "$DEBUG" ];then
@@ -701,6 +703,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
     if [ $(basename $1) = "CHECKSUMS.md5.asc" -a ! -e $TMPDIR/signaturedownloaded ];then
       mv ${TMPDIR}/CHECKSUMS.md5.asc ${TMPDIR}/CHECKSUMS.md5-slackware.asc
       cp ${TMPDIR}/CHECKSUMS.md5-slackware.asc ${TMPDIR}/CHECKSUMS.md5.asc
+      echo "slackpkgplus repositories" >>${TMPDIR}/CHECKSUMS.md5.asc
       for PREPO in ${REPOPLUS[*]};do
         URLFILE=${MIRRORPLUS[${PREPO/SLACKPKGPLUS_}]}CHECKSUMS.md5.asc
         if echo $URLFILE | grep -q "dir:/" ; then
@@ -1925,7 +1928,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
     cleanup
   fi
 
-  SPKGPLUS_VERSION="1.7.9"
+  SPKGPLUS_VERSION="1.7.10"
   VERSION="$VERSION / slackpkg+ $SPKGPLUS_VERSION"
   
   if [ ${VERSION:0:4} == "2.82" ];then
@@ -1963,6 +1966,18 @@ if [ "$SLACKPKGPLUS" = "on" ];then
     mkdir -p "$WORKDIR"
   fi
 
+  if ! grep -q "slackpkgplus repositories" $WORKDIR/CHECKSUMS.md5.asc 2>/dev/null &&
+       [ "$CMD" != "update" ] && [ "$CMD" != "new-config" ] && [ "$CMD" != "help" ];then
+    echo "======================================================"
+    echo "We need to force 'slackpkg update' to enable slackpkg+"
+    echo "Then you can rerun '$CMD' command                     "
+    echo "======================================================"
+    echo
+    echo "slackpkg forced to rebuild pkglist database" >> $TMPDIR/info.log
+    echo "Please may try 'slackpkg $CMD $INPUTLIST' now" >> $TMPDIR/info.log
+    CMD="update"
+  fi
+
   if [ ! -e $WORKDIR/install.log ];then
     touch $WORKDIR/install.log
   fi