Miroirs/slackpkgplus
1
0
Fork 0
mirror of https://github.com/zuno/slackpkgplus synced 2024-12-26 09:58:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

the "comma" syntax works with 'search' too

Browse source
This commit is contained in:
Matteo Rossini 2022-01-08 17:55:47 +01:00
parent 1d350b8dce
commit 80d76362cc
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/slackpkgplus.sh
View file

@ -1332,7 +1332,11 @@ if [ "$SLACKPKGPLUS" = "on" ];then
}' l_dir=${DIR} > $PKGINFOS }' l_dir=${DIR} > $PKGINFOS
else # -- CMD==search else # -- CMD==search
grep -h ${GREPOPTS} "^$DIR" ${TMPDIR}/pkglist ${TMPDIR}/pkglist-pre|grep -E ${GREPOPTS} "/SLACKPKGPLUS_$SEARCHSTR/|/$SEARCHSTR/|/$SEARCHSTR | [^ /]*$SEARCHSTR[^ /]* " > $PKGINFOS if [[ "${SEARCHSTR}" =~ .*,$ ]];then
grep -h ${GREPOPTS} "^$DIR" ${TMPDIR}/pkglist ${TMPDIR}/pkglist-pre|grep -E ${GREPOPTS} "^[^ ]* ${SEARCHSTR%,} " > $PKGINFOS
else
grep -h ${GREPOPTS} "^$DIR" ${TMPDIR}/pkglist ${TMPDIR}/pkglist-pre|grep -E ${GREPOPTS} "/SLACKPKGPLUS_$SEARCHSTR/|/$SEARCHSTR/|/$SEARCHSTR | [^ /]*$SEARCHSTR[^ /]* " > $PKGINFOS
fi
fi fi
PKGTOPROCESS=$(cat $PKGINFOS|wc -l) PKGTOPROCESS=$(cat $PKGINFOS|wc -l)
PKGINPROGRES=0 PKGINPROGRES=0
@ -1488,7 +1492,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
fi fi
done|sort done|sort
echo -en "\r" >&2 echo -en "\r" >&2
}|column -t -s '#' -o ' '|( [[ "$CMD" == "search" ]]&&grep -E -i --color -e ^ -e "$PATTERN"||cat ) }|column -t -s '#' -o ' '|( [[ "$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
@ -2386,12 +2390,12 @@ if [ "$SLACKPKGPLUS" = "on" ];then
searchlistEX "$LIST" searchlistEX "$LIST"
echo -e "\nYou can search specific files using \"slackpkg file-search file\".\n" echo -e "\nYou can search specific files using \"slackpkg file-search file\".\n"
fi fi
SBORESULT="$(grep -E -i "^SBO_[^ ]* [^ ]*$PATTERN" $WORKDIR/pkglist 2>/dev/null|awk '{print $6}')" SBORESULT="$(grep -E -i "^SBO_[^ ]* [^ ]*${PATTERN/,/ }" $WORKDIR/pkglist 2>/dev/null|awk '{print $6}')"
if [ ! -z "$SBORESULT" ];then if [ ! -z "$SBORESULT" ];then
echo echo
echo "Also found in SBo (download it with 'slackpkg download <package>'):" echo "Also found in SBo (download it with 'slackpkg download <package>'):"
echo echo
echo -e "[package]\n$SBORESULT"|sed -e 's/ / /' -e 's/^/ /' -e 's/ \[/[ /g' -e 's/\]/ ]/g'|grep --color -E -i -e "$PATTERN" -e ^ echo -e "[package]\n$SBORESULT"|sed -e 's/ / /' -e 's/^/ /' -e 's/ \[/[ /g' -e 's/\]/ ]/g'|grep --color -E -i -e "${PATTERN%,}" -e ^
echo echo
fi fi
;; ;;