Customization/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-12-21 03:41:57 +00:00
Code Releases Activity

Refactor grep.zsh file

Browse source 
- Move grep-alias path to variable.
- Use <<< "" instead of piped echo to check grep flags.
- Remove check for --color only since it's the same release as --exclude.
This commit is contained in:
Marc Cornellà 2020-03-01 20:17:38 +01:00
parent 8d814fdff6
commit dc190d872a
1 changed files with 20 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
lib/grep.zsh
View file

@ -1,39 +1,37 @@
# see if we already cached the grep alias in past day __GREP_CACHE_FILE="$ZSH_CACHE_DIR"/grep-alias
_grep_alias_cache=("$ZSH_CACHE_DIR"/grep_alias.zsh(Nm-24))
if (( $#_grep_alias_cache )); then # See if there's a cache file modified in the last day
source "$ZSH_CACHE_DIR"/grep_alias.zsh __GREP_ALIAS_CACHES=("$__GREP_CACHE_FILE"(Nm-1))
else if [[ -z "$__GREP_ALIAS_CACHES" ]]; then
# is x grep argument available?
grep-flags-available() { grep-flags-available() {
echo | grep "$@" "" >/dev/null 2>&1 command grep "$@" "" &>/dev/null <<< ""
} }
GREP_OPTIONS="" # Ignore these folders (if the necessary grep flags are available)
# ignore these folders (if the necessary grep flags are available)
EXC_FOLDERS="{.bzr,CVS,.git,.hg,.svn,.idea,.tox}" EXC_FOLDERS="{.bzr,CVS,.git,.hg,.svn,.idea,.tox}"
# Check for --exclude-dir, otherwise check for --exclude. If --exclude
# isn't available, --color won't be either (they were released at the same
# time (v2.5): http://git.savannah.gnu.org/cgit/grep.git/tree/NEWS?id=1236f007
if grep-flags-available --color=auto --exclude-dir=.cvs; then if grep-flags-available --color=auto --exclude-dir=.cvs; then
GREP_OPTIONS+="--color=auto --exclude-dir=$EXC_FOLDERS" GREP_OPTIONS="--color=auto --exclude-dir=$EXC_FOLDERS"
elif grep-flags-available --color=auto --exclude=.cvs; then elif grep-flags-available --color=auto --exclude=.cvs; then
GREP_OPTIONS+="--color=auto --exclude=$EXC_FOLDERS" GREP_OPTIONS="--color=auto --exclude=$EXC_FOLDERS"
elif grep-flags-available --color=auto; then
GREP_OPTIONS+="--color=auto"
fi fi
{ {
if [[ -n "$GREP_OPTIONS" ]]; then if [[ -n "$GREP_OPTIONS" ]]; then
# export grep, egrep and fgrep settings # export grep, egrep and fgrep settings
echo alias grep="'grep $GREP_OPTIONS'" echo "alias grep='grep $GREP_OPTIONS'"
echo alias egrep="'egrep $GREP_OPTIONS'" echo "alias egrep='egrep $GREP_OPTIONS'"
echo alias fgrep="'fgrep $GREP_OPTIONS'" echo "alias fgrep='fgrep $GREP_OPTIONS'"
fi fi
} > "$ZSH_CACHE_DIR/grep_alias.zsh" } > "$__GREP_CACHE_FILE"
source "$ZSH_CACHE_DIR/grep_alias.zsh" # Clean up
# clean up
unset GREP_OPTIONS EXC_FOLDERS unset GREP_OPTIONS EXC_FOLDERS
unfunction grep-flags-available unfunction grep-flags-available
fi fi
unset _grep_alias_cache
source "$__GREP_CACHE_FILE"
unset __GREP_CACHE_FILE __GREP_ALIAS_CACHES