Miroirs/slackpkg
1
0
Fork 0
mirror of https://github.com/rworkman/slackpkg synced 2025-01-22 19:27:14 +01:00
Code Issues Projects Releases Packages Wiki Activity

Convert ${ROOT}/${CONF} -> ${CONF} and tweak blacklists

Browse source 
Signed-off-by: Robby Workman <rworkman@slackware.com>
This commit is contained in:
Dave Woodfall 2021-02-13 16:34:49 -06:00 • committed by Robby Workman
parent d8e4736aa4
commit 4b07c4226c
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
files/core-functions.sh
View file

@ -589,24 +589,22 @@ function listpkgname() {
function mkregex_blacklist() { function mkregex_blacklist() {
# create tmp blacklist in a more usable format # create tmp blacklist in a more usable format
sed -E " sed -E "
/(^#|[[:blank:]]+$|^[[:blank:]]+|^$)/d s,(^[[:blank:]]+|[[:blank:]]+$),,
/(^#|^$)/d
s,^, , s,^, ,
s,$, , s,$, ,
s,^\s(extra|pasture|patches|slackware(|64)|testing)\s$,\1 , s,^\s(extra|pasture|patches|slackware(|64)|testing)\s$,\1 ,
s,^\s(tgz|txz)\s$, \1, s,^\s(tgz|txz)\s$, \1,
s,^\s([^/]+)/\s$, ./$PKGMAIN/\1 , s,^\s([^/]+)/\s$, ./$PKGMAIN/\1 ,
" ${ROOT}/${CONF}/blacklist > ${TMPDIR}/blacklist.tmp " ${CONF}/blacklist > ${TMPDIR}/blacklist.tmp
# create second blacklist of single packages from tmp list # create second blacklist of single packages from tmp list
cat ${ROOT}/${WORKDIR}/pkglist | grep -E -f ${TMPDIR}/blacklist.tmp | grep -E -f ${TMPDIR}/blacklist.tmp ${ROOT}/${WORKDIR}/pkglist |
awk '{print $2}' | sed -E "s,^, ,; s,$, ," > ${TMPDIR}/blacklist awk '{print " "$2" "}' > ${TMPDIR}/blacklist
# remove sets from tmp blacklist, join both lists to create unique list # remove sets from tmp blacklist, join both lists to create unique list
sed -E "/\.\/$PKGMAIN\/[^/]+/d" ${TMPDIR}/blacklist.tmp | sed -E "/\.\/$PKGMAIN\/[[:alpha:]]+/d" ${TMPDIR}/blacklist.tmp |
sort -u -o ${TMPDIR}/blacklist ${TMPDIR}/blacklist - sort -u -o ${TMPDIR}/blacklist ${TMPDIR}/blacklist -
# clean up
rm -f ${TMPDIR}/blacklist.tmp
} }
# blacklist filter # blacklist filter
@ -1243,7 +1241,7 @@ function sanity_check() {
if [ "$FILES" != "" ]; then if [ "$FILES" != "" ]; then
for i in $FILES ; do for i in $FILES ; do
echo "${i}" | grep -qE -f ${ROOT}/${CONF}/blacklist && continue echo "${i}" | grep -qE -f ${CONF}/blacklist && continue
DOUBLEFILES="$DOUBLEFILES $i" DOUBLEFILES="$DOUBLEFILES $i"
done done
unset FILES unset FILES