adphi/oh-my-zsh
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'patch-ls-g-alias'

Browse Source 
Closes #4988
This commit is contained in:
Marc Cornellà 2016-11-02 15:44:10 +01:00
commit 2d964086af
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/theme-and-appearance.zsh
View File

@ -21,7 +21,7 @@ if [[ "$DISABLE_LS_COLORS" != "true" ]]; then
colorls -G -d . &>/dev/null && alias ls='colorls -G' colorls -G -d . &>/dev/null && alias ls='colorls -G'
elif [[ "$OSTYPE" == darwin* ]]; then elif [[ "$OSTYPE" == darwin* ]]; then
# this is a good alias, it works by default just using $LSCOLORS # this is a good alias, it works by default just using $LSCOLORS
alias ls='ls -G' ls -G . &>/dev/null && alias ls='ls -G'
# only use coreutils ls if there is a dircolors customization present ($LS_COLORS or .dircolors file) # only use coreutils ls if there is a dircolors customization present ($LS_COLORS or .dircolors file)
# otherwise, gls will use the default color scheme which is ugly af # otherwise, gls will use the default color scheme which is ugly af
@ -32,7 +32,7 @@ if [[ "$DISABLE_LS_COLORS" != "true" ]]; then
(( $+commands[dircolors] )) && eval "$(dircolors -b)" (( $+commands[dircolors] )) && eval "$(dircolors -b)"
fi fi
ls --color -d . &>/dev/null && alias ls='ls --color=tty' || alias ls='ls -G' ls --color -d . &>/dev/null && alias ls='ls --color=tty' || ls -G . &>/dev/null && alias ls='ls -G'
# Take advantage of $LS_COLORS for completion as well. # Take advantage of $LS_COLORS for completion as well.
zstyle ':completion:*' list-colors "${(s.:.)LS_COLORS}" zstyle ':completion:*' list-colors "${(s.:.)LS_COLORS}"