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

Bugfix: greylist did not work properly

Browse source
This commit is contained in:
Matteo Rossini 2016-01-15 16:08:40 +01:00
parent a05b6424c6
commit 2a61214e19
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/greylist
View file

@ -17,4 +17,4 @@
#kdei #kdei
# #
#do not upgrade packages installed with sbopkg; use it instead #do not upgrade packages installed with sbopkg; use it instead
#_SBo #[0-9]+_SBo

5
src/slackpkgplus.sh
View file

@ -1032,7 +1032,6 @@ if [ "$SLACKPKGPLUS" = "on" ];then
if [ "$GREYLIST" == "off" ];then if [ "$GREYLIST" == "off" ];then
>$TMPDIR/greylist >$TMPDIR/greylist
fi fi
grep -Ew -f $TMPDIR/greylist $TMPDIR/pkglist|awk '{print $2}' >$TMPDIR/unchecklist
rm -f $TMPDIR/dialog.tmp rm -f $TMPDIR/dialog.tmp
if [ "$2" = "upgrade" ]; then if [ "$2" = "upgrade" ]; then
@ -1046,7 +1045,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
PKGVER=$(echo $i|rev|cut -f3 -d-|rev) PKGVER=$(echo $i|rev|cut -f3 -d-|rev)
ALLFOUND=$(echo $(grep " ${BASENAME} " $TMPDIR/pkglist|sed -r -e 's/SLACKPKGPLUS_//' -e 's/^([^ ]*) [^ ]* ([^ ]*) [^ ]* ([^ ]*) .*/\2-\3(\1) ,/')|sed 's/,$//') ALLFOUND=$(echo $(grep " ${BASENAME} " $TMPDIR/pkglist|sed -r -e 's/SLACKPKGPLUS_//' -e 's/^([^ ]*) [^ ]* ([^ ]*) [^ ]* ([^ ]*) .*/\2-\3(\1) ,/')|sed 's/,$//')
grep -q "^$(echo $i|rev|cut -f4- -d-|rev)$" $TMPDIR/unchecklist && TMPONOFF="off" grep -m1 " ${BASENAME} " $TMPDIR/pkglist|grep -q -Ew -f $TMPDIR/greylist && TMPONOFF="off"
echo "$REPOPOSFULL $i \"$REPOPOS\" $TMPONOFF \"installed: $PKGFOUND --> available: $ALLFOUND\"" >>$TMPDIR/dialog.tmp.1 echo "$REPOPOSFULL $i \"$REPOPOS\" $TMPONOFF \"installed: $PKGFOUND --> available: $ALLFOUND\"" >>$TMPDIR/dialog.tmp.1
done done
@ -1068,7 +1067,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
for i in $1; do for i in $1; do
TMPONOFF=$ONOFF TMPONOFF=$ONOFF
REPOPOS=$(grep -m1 " $(echo $i|sed 's/\.t.z//') " $TMPDIR/pkglist|awk '{print $1}'|sed 's/SLACKPKGPLUS_//') REPOPOS=$(grep -m1 " $(echo $i|sed 's/\.t.z//') " $TMPDIR/pkglist|awk '{print $1}'|sed 's/SLACKPKGPLUS_//')
grep -q "^$(echo $i|rev|cut -f4- -d-|rev)$" $TMPDIR/unchecklist && TMPONOFF="off" grep -m1 " $(echo $i|sed 's/\.t.z//') " $TMPDIR/pkglist| grep -q -Ew -f $TMPDIR/greylist && TMPONOFF="off"
echo "$i \"$REPOPOS\" $TMPONOFF" >>$TMPDIR/dialog.tmp echo "$i \"$REPOPOS\" $TMPONOFF" >>$TMPDIR/dialog.tmp
done done
HINT="" HINT=""