Miroirs/slackpkgplus
1
0
Fork 0
mirror of https://github.com/zuno/slackpkgplus synced 2025-01-13 20:01:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed an incompatibility with dir:// repository and slackpkg 15.0.1

Browse source
This commit is contained in:
Matteo Rossini 2021-03-20 22:57:32 +01:00
parent a9d4992e0b
commit 659f4d082b
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/slackpkgplus.sh
View file

@ -107,6 +107,9 @@ if [ "$SLACKPKGPLUS" = "on" ];then
##### ===== BLACKLIST FUNCTIONS === #####
# Patching makelist() original function to accept pkglist-pre
eval "$(type makelist | sed -e $'1d;2c\\\nmakelist()\n' -e 's,cat ${WORKDIR}/pkglist > ${TMPDIR}/pkglist,cat $TMPDIR/pkglist-pre ${WORKDIR}/pkglist > ${TMPDIR}/pkglist,')"
# Adds the pattern given by $(1) into the internal blacklist
# ${TMPDIR}/blacklist.slackpkgplus
#
@ -125,9 +128,6 @@ if [ "$SLACKPKGPLUS" = "on" ];then
fi
cat > ${TMPDIR}/inblacklist
grep -vE -f ${TMPDIR}/blacklist -f ${TMPDIR}/blacklist.slackpkgplus ${TMPDIR}/inblacklist >${TMPDIR}/outblacklist
if [ "$(head -1 ${TMPDIR}/outblacklist|awk '{print $1}')" != "local" ];then
cat ${TMPDIR}/pkglist-pre
fi
cat ${TMPDIR}/outblacklist
cat $TMPDIR/greylist.* >$TMPDIR/greylist
grep -qvEw -f $TMPDIR/greylist $TMPDIR/pkglist-pre >$TMPDIR/unchecklist