From 105d2fb36393f1ba82cc5f296f3bf46d4b4f2313 Mon Sep 17 00:00:00 2001 From: Peng Li Date: Sat, 18 Feb 2017 13:59:02 +0800 Subject: [PATCH] zsh, fix ls color issue on mac and linux --- zsh/zshrc | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/zsh/zshrc b/zsh/zshrc index a023e34..7eed9d1 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -1,4 +1,8 @@ #!/bin/zsh +# +# Darwin or Linux +OSNAME=`uname` + 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 -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 @@ -103,10 +107,16 @@ alias grep='grep --color -E' #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' -- 2.11.0