summaryrefslogtreecommitdiffstats
path: root/files/core-functions.sh
diff options
context:
space:
mode:
Diffstat (limited to 'files/core-functions.sh')
-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