projects
/
grml-etc-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d338dea
)
zshrc: don't overwrite {ls,grep}_options set in .zshrc.pre
author
Moviuro
<moviuro+grml@gmail.com>
Sun, 12 Apr 2015 12:12:02 +0000
(14:12 +0200)
committer
Michael Prokop
<mika@grml.org>
Mon, 13 Apr 2015 07:00:03 +0000
(09:00 +0200)
(cherry picked from commit
57b7364b7da842f486c85f7abae6ce457a23cc5c
)
etc/zsh/zshrc
patch
|
blob
|
history
diff --git
a/etc/zsh/zshrc
b/etc/zsh/zshrc
index
4e06cde
..
f66bebc
100644
(file)
--- a/
etc/zsh/zshrc
+++ b/
etc/zsh/zshrc
@@
-358,12
+358,12
@@
ZSH_NO_DEFAULT_LOCALE=${ZSH_NO_DEFAULT_LOCALE:-0}
typeset -ga ls_options
typeset -ga grep_options
if ls --color=auto / >/dev/null 2>&1; then
- ls_options=( --color=auto )
+ ls_options
+
=( --color=auto )
elif ls -G / >/dev/null 2>&1; then
- ls_options=( -G )
+ ls_options
+
=( -G )
fi
if grep --color=auto -q "a" <<< "a" >/dev/null 2>&1; then
- grep_options=( --color=auto )
+ grep_options
+
=( --color=auto )
fi
# utility functions