summaryrefslogtreecommitdiffstats
path: root/files
diff options
context:
space:
mode:
authorDave Woodfall <dave@tty1.uk>2018-12-30 13:15:07 +0000
committerRobby Workman <rworkman@slackware.com>2018-12-30 19:56:58 -0600
commit7a62e902c7a82ce56d625d22fef7a933a3141a0d (patch)
treee6944ccfd840f336f353c92232b90d0fa8ae5fe4 /files
parentd358f77039efcf712b22c7243a1f4231d0f73c28 (diff)
downloadslackpkg-7a62e902c7a82ce56d625d22fef7a933a3141a0d.tar.xz
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 <rworkman@slackware.com>
Diffstat (limited to 'files')
-rw-r--r--files/core-functions.sh9
1 files changed, 6 insertions, 3 deletions
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