diff options
| author | Marc Cornellà <marc.cornella@live.com> | 2020-03-02 12:35:58 +0100 |
|---|---|---|
| committer | Marc Cornellà <marc.cornella@live.com> | 2020-03-02 12:35:58 +0100 |
| commit | d3dfc1371693d2b64ccec249511ea9178b088015 (patch) | |
| tree | 0876266f3eab8c61c1fe802d0bfbe4292ac2af7d /lib/grep.zsh | |
| parent | 9ce7de9f16ba894423bc5105c7e959894ca2e751 (diff) | |
| download | zsh-d3dfc1371693d2b64ccec249511ea9178b088015.tar.gz zsh-d3dfc1371693d2b64ccec249511ea9178b088015.tar.bz2 zsh-d3dfc1371693d2b64ccec249511ea9178b088015.zip | |
lib: use grep-alias cache only if ZSH_CACHE_DIR is writable
Fixes #8693
Diffstat (limited to 'lib/grep.zsh')
| -rw-r--r-- | lib/grep.zsh | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/lib/grep.zsh b/lib/grep.zsh index 1d94eb978..a725e0f26 100644 --- a/lib/grep.zsh +++ b/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 __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() { command grep "$@" "" &>/dev/null <<< "" } @@ -12,26 +14,28 @@ if [[ -z "$__GREP_ALIAS_CACHES" ]]; then # 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 + # 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 GREP_OPTIONS="--color=auto --exclude-dir=$EXC_FOLDERS" elif grep-flags-available --color=auto --exclude=.cvs; then GREP_OPTIONS="--color=auto --exclude=$EXC_FOLDERS" fi - { - if [[ -n "$GREP_OPTIONS" ]]; then - # export grep, egrep and fgrep settings - echo "alias grep='grep $GREP_OPTIONS'" - echo "alias egrep='egrep $GREP_OPTIONS'" - echo "alias fgrep='fgrep $GREP_OPTIONS'" + if [[ -n "$GREP_OPTIONS" ]]; then + # export grep, egrep and fgrep settings + alias grep="grep $GREP_OPTIONS" + alias egrep="egrep $GREP_OPTIONS" + 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 - } > "$__GREP_CACHE_FILE" + fi # Clean up unset GREP_OPTIONS EXC_FOLDERS unfunction grep-flags-available fi -source "$__GREP_CACHE_FILE" unset __GREP_CACHE_FILE __GREP_ALIAS_CACHES |