From 7a62e902c7a82ce56d625d22fef7a933a3141a0d Mon Sep 17 00:00:00 2001 From: Dave Woodfall Date: Sun, 30 Dec 2018 13:15:07 +0000 Subject: Fix support for package sets (try #2) This adds ./$PKGMAIN/ to a blacklisted set line, which ought to say turn kde/ into ./slackware64/kde as it listed in the temp pkglist. I've tightened up the patches/pasture/extra etc. lines too. Signed-off-by: Robby Workman --- files/core-functions.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'files') diff --git a/files/core-functions.sh b/files/core-functions.sh index 76aebc0..93b11e2 100644 --- a/files/core-functions.sh +++ b/files/core-functions.sh @@ -590,10 +590,13 @@ function makelist() { INPUTLIST=$@ grep -vE "(^#|^[[:blank:]]*$)" ${CONF}/blacklist | \ - sed -E "s,^, , + sed -E " + s,^, , s,$, , - s,^\s(extra|pasture|patches|slackware(|64)|testing|txz|.*/)\s$,\1, - s,/$,," \ + s,^\s(extra|pasture|patches|slackware(|64)|testing)\s$,\1 , + s,^\s(tgz|txz)\s$, \1, + s,^\s([^/]*)/\s$, ./$PKGMAIN/\1 , + " \ > ${TMPDIR}/blacklist if echo $CMD | grep -q install ; then -- cgit v1.2.3