Miroirs/slackpkg
1
0
Fork 0
mirror of https://github.com/rworkman/slackpkg synced 2024-12-25 21:58:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix support for package sets (try #2)

Browse source 
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>
This commit is contained in:
Dave Woodfall 2018-12-30 13:15:07 +00:00 committed by Robby Workman
parent d358f77039
commit 7a62e902c7
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
files/core-functions.sh
View file

@ -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