From 659f4d082b3d14ffe034b5a951631ab6888b6f6d Mon Sep 17 00:00:00 2001
From: Matteo Rossini <info@slakfinder.org>
Date: Sat, 20 Mar 2021 22:57:32 +0100
Subject: [PATCH] Fixed an incompatibility with dir:// repository and slackpkg
 15.0.1

---
 src/slackpkgplus.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/slackpkgplus.sh b/src/slackpkgplus.sh
index 8b4180d..3bc9b64 100755
--- a/src/slackpkgplus.sh
+++ b/src/slackpkgplus.sh
@@ -107,6 +107,9 @@ if [ "$SLACKPKGPLUS" = "on" ];then
 
   ##### ===== BLACKLIST FUNCTIONS === #####
 
+    # Patching makelist() original function to accept pkglist-pre
+  eval "$(type makelist | sed -e $'1d;2c\\\nmakelist()\n' -e 's,cat ${WORKDIR}/pkglist > ${TMPDIR}/pkglist,cat $TMPDIR/pkglist-pre ${WORKDIR}/pkglist > ${TMPDIR}/pkglist,')"
+
     # Adds the pattern given by $(1) into the internal blacklist
     # ${TMPDIR}/blacklist.slackpkgplus
     #
@@ -125,9 +128,6 @@ if [ "$SLACKPKGPLUS" = "on" ];then
     fi
     cat > ${TMPDIR}/inblacklist
     grep -vE -f ${TMPDIR}/blacklist -f ${TMPDIR}/blacklist.slackpkgplus ${TMPDIR}/inblacklist >${TMPDIR}/outblacklist
-    if [ "$(head -1 ${TMPDIR}/outblacklist|awk '{print $1}')" != "local" ];then
-      cat ${TMPDIR}/pkglist-pre
-    fi
     cat ${TMPDIR}/outblacklist
     cat $TMPDIR/greylist.* >$TMPDIR/greylist
     grep -qvEw -f $TMPDIR/greylist $TMPDIR/pkglist-pre >$TMPDIR/unchecklist