From bb129404f51cb2c8cf2b7d7ab0e0c4de8b79df07 Mon Sep 17 00:00:00 2001
From: Matteo Rossini <info@slakfinder.org>
Date: Sun, 16 Jan 2022 00:41:15 +0100
Subject: [PATCH] Sun Jan 16 00:05:32 CET 2022
 pkg/slackpkg+-1.8.rc2-noarch-1mt.txz: Upgrade   - Fixed an advice at first
 1.8 install   - Fixed slackpkg info for sbo packages   - Avoid slackpkg runs
 update before load slackpkg+ code   - Fixed automatic rebuild pkglist

---
 ChangeLog.txt       | 8 ++++++++
 src/ChangeLog.txt   | 8 ++++++++
 src/doinst.sh       | 3 ++-
 src/slackpkgplus.sh | 3 ++-
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index ea3b6d4..28097d9 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,11 @@
+Sun Jan 16 00:05:32 CET 2022
+pkg/slackpkg+-1.8.rc2-noarch-1mt.txz: Upgrade
+  - Fixed an advice at first 1.8 install
+  - Fixed slackpkg info for sbo packages
+  - Avoid slackpkg runs update before load slackpkg+ code
+  - Fixed automatic rebuild pkglist
++-------------------------+
+
 Fri Jan 14 20:49:06 CET 2022
 pkg/slackpkg+-1.8.rc1-noarch-2mt.txz: Upgrade
   - Advice to run /var/lib/pkgtools/setup/setup.vi-ex if some upgrade
diff --git a/src/ChangeLog.txt b/src/ChangeLog.txt
index ea3b6d4..28097d9 100644
--- a/src/ChangeLog.txt
+++ b/src/ChangeLog.txt
@@ -1,3 +1,11 @@
+Sun Jan 16 00:05:32 CET 2022
+pkg/slackpkg+-1.8.rc2-noarch-1mt.txz: Upgrade
+  - Fixed an advice at first 1.8 install
+  - Fixed slackpkg info for sbo packages
+  - Avoid slackpkg runs update before load slackpkg+ code
+  - Fixed automatic rebuild pkglist
++-------------------------+
+
 Fri Jan 14 20:49:06 CET 2022
 pkg/slackpkg+-1.8.rc1-noarch-2mt.txz: Upgrade
   - Advice to run /var/lib/pkgtools/setup/setup.vi-ex if some upgrade
diff --git a/src/doinst.sh b/src/doinst.sh
index 8402e24..6fdec32 100644
--- a/src/doinst.sh
+++ b/src/doinst.sh
@@ -40,7 +40,8 @@ config etc/slackpkg/greylist.new
 config etc/slackpkg/notifymsg.conf.new
 
 if [ -d var/lib/slackpkg ];then
+  WORKDIR=var/lib/slackpkg
   [ ! -e $WORKDIR/pkglist ]&&touch $WORKDIR/pkglist
-  [ ! -e $WORKDIR/current ]&&touch $WORKDIR/currentplus
+  [   -e $WORKDIR/current ]&&touch $WORKDIR/currentplus
   [ ! -e $WORKDIR/CHECKSUMS.md5 ]&&touch $WORKDIR/CHECKSUMS.md5
 fi
diff --git a/src/slackpkgplus.sh b/src/slackpkgplus.sh
index 3b641bd..9a1f0c4 100755
--- a/src/slackpkgplus.sh
+++ b/src/slackpkgplus.sh
@@ -1991,7 +1991,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
     cleanup
   fi
 
-  SPKGPLUS_VERSION="1.8.rc1"
+  SPKGPLUS_VERSION="1.8.rc2"
   VERSION="$VERSION / slackpkg+ $SPKGPLUS_VERSION"
   
   if [ ${VERSION:0:4} == "2.82" ];then
@@ -2085,6 +2085,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
   fi
   [ ! -e ${WORKDIR}/current ] && rm -f ${WORKDIR}/currentplus 2>/dev/null ||touch ${WORKDIR}/currentplus 2>/dev/null
 
+  [ ! -s $WORKDIR/pkglist ] && rm -f $WORKDIR/CHECKSUMS.md5.asc
   if ! grep -q "slackpkgplus repositories" $WORKDIR/CHECKSUMS.md5.asc 2>/dev/null &&
        [ "$CMD" != "update" ] && [ "$CMD" != "new-config" ] && [ "$CMD" != "help" ];then
     echo "======================================================"