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 slackpkg search that did not honour correctly some special chars as '+' and '.'

Browse source
This commit is contained in:
Matteo Rossini 2016-03-03 23:51:27 +01:00
parent f85b2ca2a8
commit 9fb8e78c49
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/slackpkgplus.sh
View file

@ -930,23 +930,23 @@ if [ "$SLACKPKGPLUS" = "on" ];then
}' l_dir=${DIR} > $PKGINFOS }' l_dir=${DIR} > $PKGINFOS
else # -- CMD==search else # -- CMD==search
grep -h ${GREPOPTS} "^$DIR" ${WORKDIR}/pkglist ${TMPDIR}/pkglist-pre|grep ${GREPOPTS} "/SLACKPKGPLUS_$SEARCHSTR/\|/$SEARCHSTR/\|/$SEARCHSTR \| [^ /]*$SEARCHSTR[^ /]* " > $PKGINFOS grep -h ${GREPOPTS} "^$DIR" ${WORKDIR}/pkglist ${TMPDIR}/pkglist-pre|grep -E ${GREPOPTS} "/SLACKPKGPLUS_$SEARCHSTR/|/$SEARCHSTR/|/$SEARCHSTR | [^ /]*$SEARCHSTR[^ /]* " > $PKGINFOS
fi fi
while read PKGDIR PKGBASENAME PKGVER PKGARCH PKGBUILD PKGFULLNAME PKGPATH PKGEXT ; do while read PKGDIR PKGBASENAME PKGVER PKGARCH PKGBUILD PKGFULLNAME PKGPATH PKGEXT ; do
# does nothing when the package has been handled ... # does nothing when the package has been handled ...
grep ${GREPOPTS} -q "^repo:${PKGDIR}:bname:${PKGBASENAME}:ver:${PKGVER}:fname:${PKGFULLNAME}:" $PKGLIST && continue grep -E ${GREPOPTS} -q "^repo:${PKGDIR}:bname:${PKGBASENAME}:ver:${PKGVER}:fname:${PKGFULLNAME}:" $PKGLIST && continue
# When a package P' with the same basename has been handled before the current package, this means # When a package P' with the same basename has been handled before the current package, this means
# the package P' has precedence over P. # the package P' has precedence over P.
if grep ${GREPOPTS} -q ":bname:${PKGBASENAME}:" $PKGLIST ; then if grep -E ${GREPOPTS} -q ":bname:${PKGBASENAME}:" $PKGLIST ; then
# if the current package P is installed, this means the previous P' will be # if the current package P is installed, this means the previous P' will be
# proposed as an upgrade to P. In this case, the loop must continue without # proposed as an upgrade to P. In this case, the loop must continue without
# any other action... # any other action...
grep ${GREPOPTS} -q " $PKGFULLNAME " ${TMPDIR}/tmplist && continue grep -E ${GREPOPTS} -q " $PKGFULLNAME " ${TMPDIR}/tmplist && continue
# The current package P is not installed. In this case P must be shown as # The current package P is not installed. In this case P must be shown as
# being uninstalled and masked. # being uninstalled and masked.
@ -1037,7 +1037,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
else else
printf " %-20s %-24s %-40s \n" "$STATUS" "$REPO" "${RAWNAME}" printf " %-20s %-24s %-40s \n" "$STATUS" "$REPO" "${RAWNAME}"
fi fi
done|sort|( [[ "$CMD" == "search" ]]&&grep -i --color -e ^ -e "$PATTERN"||cat ) done|sort|( [[ "$CMD" == "search" ]]&&grep -E -i --color -e ^ -e "$PATTERN"||cat )
} # END function searchlistEX() } # END function searchlistEX()
# Show detailed info for slackpkg info # Show detailed info for slackpkg info