XorA
/
bash-it
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix search command for RedHat based distributions

pull/834/head
Eduardo Bellido Bellido 2016-11-13 00:55:55 +01:00
parent 563385b6a1
commit 5f2a4b5d8b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/search.bash
View File

@ -86,7 +86,7 @@ _bash-it-search-component() {
fi fi
done done
local _grep=$(which egrep || which grep) local _grep=$((which --skip-alias grep 2> /dev/null || which grep) | tail -n 1)
declare -a terms=($@) # passed on the command line declare -a terms=($@) # passed on the command line
declare -a matches=() # results that we found declare -a matches=() # results that we found
@ -98,7 +98,7 @@ _bash-it-search-component() {
[[ "${term:0:1}" == "-" ]] && negative_terms=(${negative_terms[@]} ${term:1}) && continue [[ "${term:0:1}" == "-" ]] && negative_terms=(${negative_terms[@]} ${term:1}) && continue
# print asterisk next to each result that is already enabled by the user # print asterisk next to each result that is already enabled by the user
local term_match=($(echo "${help}"| ${_grep} -i -- ${term} | egrep '\[( |x)\]' | cut -b -30 | sed 's/ *\[ \]//g;s/ *\[x\]/*/g;' )) local term_match=($(echo "${help}"| ${_grep} -i -- ${term} | ${_grep} -E '\[( |x)\]' | cut -b -30 | sed 's/ *\[ \]//g;s/ *\[x\]/*/g;' ))
[[ "${#term_match[@]}" -gt 0 ]] && { [[ "${#term_match[@]}" -gt 0 ]] && {
matches=(${matches[@]} ${term_match[@]}) # append to the list of results matches=(${matches[@]} ${term_match[@]}) # append to the list of results
} }