Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Oh My Zsh
Commits
d3dfc137
Commit
d3dfc137
authored
Mar 02, 2020
by
Marc Cornellà
Browse files
lib: use grep-alias cache only if ZSH_CACHE_DIR is writable
Fixes #8693
parent
9ce7de9f
Changes
1
Show whitespace changes
Inline
Side-by-side
lib/grep.zsh
View file @
d3dfc137
...
...
@@ -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): http
s
://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
'"
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
fi
}
>
"
$__GREP_CACHE_FILE
"
# Clean up
unset
GREP_OPTIONS EXC_FOLDERS
unfunction grep-flags-available
fi
source
"
$__GREP_CACHE_FILE
"
unset
__GREP_CACHE_FILE __GREP_ALIAS_CACHES
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment