Miroirs/slackpkgplus
1
0
Fork 0
mirror of https://github.com/zuno/slackpkgplus synced 2024-12-27 09:58:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Works with the slackpkg 2.84 (still in beta) blacklist system (but

Browse source 
not for search options)
This commit is contained in:
Matteo Rossini 2019-01-03 12:16:22 +01:00
parent 202ae81092
commit ebe7858a96
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/slackpkgplus.sh
View file

@ -109,9 +109,9 @@ if [ "$SLACKPKGPLUS" = "on" ];then
fi
if $MLREPO_SELELECTED && grep -q "^aaa_elflibs$" ${TMPDIR}/blacklist && ! grep -q "^aaa_elflibs-compat32$" ${TMPDIR}/blacklist ; then
sed -i --expression "s/^aaa_elflibs/#aaa_elflibs/" ${TMPDIR}/blacklist
grep -vEw -f ${TMPDIR}/blacklist -f ${TMPDIR}/blacklist.slackpkgplus | grep -v "[ ]aaa_elflibs[ ]" >${TMPDIR}/blacklist.tmp
grep -vE $LEGACYBLACKLIST -f ${TMPDIR}/blacklist -f ${TMPDIR}/blacklist.slackpkgplus | grep -v "[ ]aaa_elflibs[ ]" >${TMPDIR}/blacklist.tmp
else
grep -vEw -f ${TMPDIR}/blacklist -f ${TMPDIR}/blacklist.slackpkgplus >${TMPDIR}/blacklist.tmp
grep -vE $LEGACYBLACKLIST -f ${TMPDIR}/blacklist -f ${TMPDIR}/blacklist.slackpkgplus >${TMPDIR}/blacklist.tmp
fi
if [ "$(head -1 ${TMPDIR}/blacklist.tmp|awk '{print $1}')" != "local" ];then
cat ${TMPDIR}/pkglist-pre
@ -1599,6 +1599,11 @@ if [ "$SLACKPKGPLUS" = "on" ];then
cleanup
fi
if [ ${VERSION:0:4} == "2.84" ];then
LEGACYBLACKLIST=""
else
LEGACYBLACKLIST="-w"
fi
SPKGPLUS_VERSION="1.7.0d1"
VERSION="$VERSION / slackpkg+ $SPKGPLUS_VERSION"