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

https://www.linuxquestions.org/questions/slackware-14/slackpkg-1-8-a-4175669481/page4.html#post6090976

Browse source 
slackpkgplus-search-packages.patch.txt
This commit is contained in:
Matteo Rossini 2020-02-17 11:11:57 +01:00
parent 5b6aeb8d1b
commit 87147098db
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/slackpkgplus.sh
View file

@ -1101,9 +1101,14 @@ if [ "$SLACKPKGPLUS" = "on" ];then
for i in ${PRIORITY[@]}; do for i in ${PRIORITY[@]}; do
DIR="$i" DIR="$i"
PAT=""
if [[ "$DIR" =~ ^[-_[:alnum:]]+[:] ]] ; then # was if echo "$DIR" | grep -q "[a-zA-Z0-9]\+[:]" ; then if [[ "$DIR" =~ ^[-_[:alnum:]]+[:] ]] ; then # was if echo "$DIR" | grep -q "[a-zA-Z0-9]\+[:]" ; then
DIR=${i/:*/} # was DIR=$(echo "$i" | cut -f1 -d":") DIR=${i/:*/} # was DIR=$(echo "$i" | cut -f1 -d":")
PAT=${i/*:/}
# extract the pattern from $i, if and only if "$i" is to the syntax <repo>:<pattern>. Without
# this, PAT would be set to $DIR when $i is to the syntax <repo>.
#
[[ "$DIR" =~ [:][:alnum:]+ ]] && PAT=${i/*:/}
# when the current priority is of kind <REPO>:<PATTERN>, the loop must be short-circuited # when the current priority is of kind <REPO>:<PATTERN>, the loop must be short-circuited
# when SEARCHSTR does not match PATTERN, otherwise, some packages could be mistakenly # when SEARCHSTR does not match PATTERN, otherwise, some packages could be mistakenly
@ -1258,7 +1263,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
echo " $STATUS# $REPO# $CINSTPKG" echo " $STATUS# $REPO# $CINSTPKG"
else else
INSTPKG_REPO=$(grep -m 1 "$CINSTPKG" ${WORKDIR}/pkglist | cut -f1 -d" " | sed "s/SLACKPKGPLUS_//") INSTPKG_REPO=$(grep -m 1 " $CINSTPKG " ${WORKDIR}/pkglist | cut -f1 -d" " | sed "s/SLACKPKGPLUS_//")
if [ ! -z "$INSTPKG_REPO" ] && [ "$INSTPKG_REPO" != "$REPO" ] ; then if [ ! -z "$INSTPKG_REPO" ] && [ "$INSTPKG_REPO" != "$REPO" ] ; then
CINSTPKG="$INSTPKG_REPO:$CINSTPKG" CINSTPKG="$INSTPKG_REPO:$CINSTPKG"