mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-11-12 08:50:08 +00:00
lib: use grep-alias cache only if ZSH_CACHE_DIR is writable
Fixes #8693
This commit is contained in:
parent
9ce7de9f16
commit
d3dfc13716
1 changed files with 14 additions and 10 deletions
24
lib/grep.zsh
24
lib/grep.zsh
|
@ -2,7 +2,9 @@ __GREP_CACHE_FILE="$ZSH_CACHE_DIR"/grep-alias
|
||||||
|
|
||||||
# See if there's a cache file modified in the last day
|
# See if there's a cache file modified in the last day
|
||||||
__GREP_ALIAS_CACHES=("$__GREP_CACHE_FILE"(Nm-1))
|
__GREP_ALIAS_CACHES=("$__GREP_CACHE_FILE"(Nm-1))
|
||||||
if [[ -z "$__GREP_ALIAS_CACHES" ]]; then
|
if [[ -n "$__GREP_ALIAS_CACHES" ]]; then
|
||||||
|
source "$__GREP_CACHE_FILE"
|
||||||
|
else
|
||||||
grep-flags-available() {
|
grep-flags-available() {
|
||||||
command grep "$@" "" &>/dev/null <<< ""
|
command grep "$@" "" &>/dev/null <<< ""
|
||||||
}
|
}
|
||||||
|
@ -12,26 +14,28 @@ if [[ -z "$__GREP_ALIAS_CACHES" ]]; then
|
||||||
|
|
||||||
# Check for --exclude-dir, otherwise check for --exclude. If --exclude
|
# Check for --exclude-dir, otherwise check for --exclude. If --exclude
|
||||||
# isn't available, --color won't be either (they were released at the same
|
# 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
|
# time (v2.5): https://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"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
{
|
if [[ -n "$GREP_OPTIONS" ]]; then
|
||||||
if [[ -n "$GREP_OPTIONS" ]]; then
|
# export grep, egrep and fgrep settings
|
||||||
# export grep, egrep and fgrep settings
|
alias grep="grep $GREP_OPTIONS"
|
||||||
echo "alias grep='grep $GREP_OPTIONS'"
|
alias egrep="egrep $GREP_OPTIONS"
|
||||||
echo "alias egrep='egrep $GREP_OPTIONS'"
|
alias fgrep="fgrep $GREP_OPTIONS"
|
||||||
echo "alias fgrep='fgrep $GREP_OPTIONS'"
|
|
||||||
|
# write to cache file if cache directory is writable
|
||||||
|
if [[ -w "$ZSH_CACHE_DIR" ]]; then
|
||||||
|
alias -L grep egrep fgrep >| "$__GREP_CACHE_FILE"
|
||||||
fi
|
fi
|
||||||
} > "$__GREP_CACHE_FILE"
|
fi
|
||||||
|
|
||||||
# Clean up
|
# Clean up
|
||||||
unset GREP_OPTIONS EXC_FOLDERS
|
unset GREP_OPTIONS EXC_FOLDERS
|
||||||
unfunction grep-flags-available
|
unfunction grep-flags-available
|
||||||
fi
|
fi
|
||||||
|
|
||||||
source "$__GREP_CACHE_FILE"
|
|
||||||
unset __GREP_CACHE_FILE __GREP_ALIAS_CACHES
|
unset __GREP_CACHE_FILE __GREP_ALIAS_CACHES
|
||||||
|
|
Loading…
Reference in a new issue