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

- fixed warning in update when one repository does not have the changelog

Browse source 
- ignore the package extension in package selection
- fixed a regression in dir: repository
This commit is contained in:
Matteo Rossini 2016-05-19 20:51:57 +02:00
parent 80cf09386d
commit 98103d1df1
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/slackpkgplus.sh
View file

@ -628,6 +628,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
cat ${TMPDIR}/$CLOGNAM >> ${TMPDIR}/ChangeLogs/$CLOGNAM cat ${TMPDIR}/$CLOGNAM >> ${TMPDIR}/ChangeLogs/$CLOGNAM
else else
echo -e " Repository $PREPO has no ChangeLog.txt.\n" echo -e " Repository $PREPO has no ChangeLog.txt.\n"
touch ${TMPDIR}/ChangeLogs/$CLOGNAM
fi fi
done done
@ -893,6 +894,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
DIR=${CPRIORITY/:*/} DIR=${CPRIORITY/:*/}
[[ "$CPRIORITY" =~ .*:.* ]] && PAT=${CPRIORITY/*:/} || PAT="" [[ "$CPRIORITY" =~ .*:.* ]] && PAT=${CPRIORITY/*:/} || PAT=""
PAT=${PAT/.t?z/}
REPOSITORY=${DIR/SLACKPKGPLUS_/} REPOSITORY=${DIR/SLACKPKGPLUS_/}
# pass to the next iteration when there are priority filters and the # pass to the next iteration when there are priority filters and the
@ -1774,7 +1776,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
localpath=$(pwd)/$localpath localpath=$(pwd)/$localpath
fi fi
( cd $localpath ( cd $localpath
find . -type f -name '*.t[blxg]z'|sed "s,^./,./SLACKPKGPLUS_$PREPO/,"|awk -f /usr/libexec/slackpkg/pkglist.awk|sort -k6 -rn >> ${TMPDIR}/pkglist-pre find . -type f -name '*.t[blxg]z'|sed "s,^./,./SLACKPKGPLUS_$repository/,"|awk -f /usr/libexec/slackpkg/pkglist.awk|sort -k6 -rn >> ${TMPDIR}/pkglist-pre
) )
MIRRORPLUS[$repository]="file:/$localpath/" MIRRORPLUS[$repository]="file:/$localpath/"
PRIORITYLIST=( ${PRIORITYLIST[*]} SLACKPKGPLUS_${repository}:.* ) PRIORITYLIST=( ${PRIORITYLIST[*]} SLACKPKGPLUS_${repository}:.* )
@ -1883,9 +1885,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
fi fi
fi fi
if [ "$CMD" == "remove" ];then package=$(echo $package|sed 's/\.t[blxg]z$//')
package=$(echo $package|sed 's/\.t[blxg]z$//')
fi
[ ! -z "${PRIORITY_FILTER_RULE}" ] && echo "${PRIORITY_FILTER_RULE}" >> ${TMPDIR}/priority.filters [ ! -z "${PRIORITY_FILTER_RULE}" ] && echo "${PRIORITY_FILTER_RULE}" >> ${TMPDIR}/priority.filters