projects
/
dotfiles.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
c89e577
)
zsh, fix ls color issue on mac and linux
author
Peng Li
<seudut@gmail.com>
Sat, 18 Feb 2017 05:59:02 +0000
(13:59 +0800)
committer
Peng Li
<seudut@gmail.com>
Sat, 18 Feb 2017 05:59:02 +0000
(13:59 +0800)
zsh/zshrc
patch
|
blob
|
history
diff --git
a/zsh/zshrc
b/zsh/zshrc
index
a023e34
..
7eed9d1
100644
(file)
--- a/
zsh/zshrc
+++ b/
zsh/zshrc
@@
-1,4
+1,8
@@
#!/bin/zsh
#!/bin/zsh
+#
+# Darwin or Linux
+OSNAME=`uname`
+
autoload colors
colors
autoload colors
colors
@@
-82,7
+86,7
@@
zstyle ':completion:*' completer _expand _complete _correct _approximate
#zstyle ':completion:*' format 'Completing %d'
zstyle ':completion:*' group-name ''
zstyle ':completion:*' menu select=2
#zstyle ':completion:*' format 'Completing %d'
zstyle ':completion:*' group-name ''
zstyle ':completion:*' menu select=2
-eval "$(dircolors -b)"
+
#
eval "$(dircolors -b)"
zstyle ':completion:*:default' list-colors ${(s.:.)LS_COLORS}
zstyle ':completion:*' list-colors ''
zstyle ':completion:*' list-prompt %SAt %p: Hit TAB for more, or the character to insert%s
zstyle ':completion:*:default' list-colors ${(s.:.)LS_COLORS}
zstyle ':completion:*' list-colors ''
zstyle ':completion:*' list-prompt %SAt %p: Hit TAB for more, or the character to insert%s
@@
-103,10
+107,16
@@
alias grep='grep --color -E'
#alias vim='/usr/local/bin/mvim -v'
alias tmux='tmux -2'
#alias vim='/usr/local/bin/mvim -v'
alias tmux='tmux -2'
-alias l='ls -l --color=auto'
-alias ll='ls -l --color=auto'
-alias la='ls -a --color=auto'
-alias ls='ls --color=auto'
+if [[ $OSNAME == 'Darwin' ]]; then
+ alias l='ls -l'
+ alias ll='ls -l'
+ alias la='ls -a'
+elif [[ $OSNAME == 'Linux' ]]; then
+ alias l='ls -l --color=auto'
+ alias ll='ls -l --color=auto'
+ alias la='ls -a --color=auto'
+ alias ls='ls --color=auto'
+fi
alias diff='colordiff'
alias diff='colordiff'