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

Version 20131116.1 - 16/Nov/2013

Browse source 
- Missed real greylist code :)
This commit is contained in:
Matteo Rossini 2013-11-16 18:20:10 +01:00
parent 42a11dc682
commit 97f075ae99
4 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog.txt
View file

@ -1,3 +1,6 @@
Version 20131116.1 - 16/Nov/2013
- Missed real greylist code :)
Version 20131114.2 - 14/Nov/2013 Version 20131114.2 - 14/Nov/2013
- Added /etc/slackpkg/greylist . All packages in that list will be showned - Added /etc/slackpkg/greylist . All packages in that list will be showned
unchecked by default unchecked by default

3
src/ChangeLog.txt
View file

@ -1,3 +1,6 @@
Version 20131116.1 - 16/Nov/2013
- Missed real greylist code :)
Version 20131114.2 - 14/Nov/2013 Version 20131114.2 - 14/Nov/2013
- Added /etc/slackpkg/greylist . All packages in that list will be showned - Added /etc/slackpkg/greylist . All packages in that list will be showned
unchecked by default unchecked by default

7
src/slackpkgplus.sh
View file

@ -472,6 +472,11 @@ if [ "$SLACKPKGPLUS" = "on" ];then
done done
} }
touch $TMPDIR/greylist.tmp
if [ -e /etc/slackpkg/greylist ];then
cat /etc/slackpkg/greylist|sed -e 's/#.*//'|grep -v -e '^#' -e '^$'|awk '{print $1}'|sort -u >$TMPDIR/greylist.tmp
fi
REPOPLUS=$(echo "${REPOPLUS[*]} ${PKGS_PRIORITY[*]} ${!MIRRORPLUS[*]}"|sed 's/ /\n/g'|sed 's/:.*//'|awk '{if(!a[$1]++)print $1}') REPOPLUS=$(echo "${REPOPLUS[*]} ${PKGS_PRIORITY[*]} ${!MIRRORPLUS[*]}"|sed 's/ /\n/g'|sed 's/:.*//'|awk '{if(!a[$1]++)print $1}')
PRIORITY=( ${PRIORITY[*]} SLACKPKGPLUS_$(echo $REPOPLUS|sed 's/ / SLACKPKGPLUS_/g') ) PRIORITY=( ${PRIORITY[*]} SLACKPKGPLUS_$(echo $REPOPLUS|sed 's/ / SLACKPKGPLUS_/g') )
@ -874,4 +879,6 @@ if [ "$SLACKPKGPLUS" = "on" ];then
cleanup cleanup
fi fi
cat $TMPDIR/greylist*|sort -u >$TMPDIR/unchecklist
fi fi

9
src/zdialogplus.sh
View file

@ -24,17 +24,20 @@ if [ "$SLACKPKGPLUS" = "on" ];then
if [ "$2" = "upgrade" ]; then if [ "$2" = "upgrade" ]; then
ls -1 /var/log/packages > $TMPDIR/tmplist ls -1 /var/log/packages > $TMPDIR/tmplist
for i in $1; do for i in $1; do
TMPONOFF=$ONOFF
BASENAME=$(cutpkg $i) BASENAME=$(cutpkg $i)
PKGFOUND=$(grep -m1 -e "^${BASENAME}-[^-]\+-\(noarch\|fw\|${ARCH}\)" $TMPDIR/tmplist) PKGFOUND=$(grep -m1 -e "^${BASENAME}-[^-]\+-\(noarch\|fw\|${ARCH}\)" $TMPDIR/tmplist)
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"
echo "$i \"$REPOPOS\" $ONOFF \"currently installed: $PKGFOUND\"" >>$TMPDIR/dialog.tmp echo "$i \"$REPOPOS\" $TMPONOFF \"currently installed: $PKGFOUND\"" >>$TMPDIR/dialog.tmp
done done
HINT="--item-help" HINT="--item-help"
else else
for i in $1; do for i in $1; do
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_//')
echo "$i \"$REPOPOS\" $ONOFF" >>$TMPDIR/dialog.tmp grep -q "^$(echo $i|rev|cut -f4- -d-|rev)$" $TMPDIR/unchecklist && TMPONOFF="off"
echo "$i \"$REPOPOS\" $TMPONOFF" >>$TMPDIR/dialog.tmp
done done
HINT="" HINT=""
fi fi