From 1b8fcac079ad762bdabf43a2a88155c52ad0bc03 Mon Sep 17 00:00:00 2001 From: Matteo Rossini Date: Sun, 31 Jan 2016 19:20:45 +0100 Subject: [PATCH] dir:// repositories and inline repositories has best priority. --- src/slackpkgplus.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/slackpkgplus.sh b/src/slackpkgplus.sh index 7944027..4489cf0 100755 --- a/src/slackpkgplus.sh +++ b/src/slackpkgplus.sh @@ -102,10 +102,10 @@ if [ "$SLACKPKGPLUS" = "on" ];then else grep -vEw -f ${TMPDIR}/blacklist -f ${TMPDIR}/blacklist.slackpkgplus >${TMPDIR}/blacklist.tmp fi - cat ${TMPDIR}/blacklist.tmp if [ "$(head -1 ${TMPDIR}/blacklist.tmp|awk '{print $1}')" != "local" ];then cat ${TMPDIR}/pkglist-pre fi + cat ${TMPDIR}/blacklist.tmp cat $TMPDIR/greylist.* >$TMPDIR/greylist grep -qvEw -f $TMPDIR/greylist $TMPDIR/pkglist-pre >$TMPDIR/unchecklist @@ -1452,7 +1452,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then localpath=$(pwd)/$localpath fi ( cd $localpath - ls -ld *.t[blxg]z|sort -rn|grep ^-|awk '{print "./SLACKPKGPLUS_'$repository'/"$NF}'|awk -f /usr/libexec/slackpkg/pkglist.awk >> ${TMPDIR}/pkglist-pre + ls -ld *.t[blxg]z 2>/dev/null|sort -rn|grep ^-|awk '{print "./SLACKPKGPLUS_'$repository'/"$NF}'|awk -f /usr/libexec/slackpkg/pkglist.awk >> ${TMPDIR}/pkglist-pre ) MIRRORPLUS[$repository]="file:/$localpath/" PRIORITYLIST=( ${PRIORITYLIST[*]} SLACKPKGPLUS_${repository}:.* )