diff options
| author | Marc Cornellà <marc.cornella@live.com> | 2016-11-02 15:44:10 +0100 |
|---|---|---|
| committer | Marc Cornellà <marc.cornella@live.com> | 2016-11-02 15:44:10 +0100 |
| commit | 2d964086af95f4b46589459643f20ca00bbb8102 (patch) | |
| tree | 336be78afc200090d18b58218bb87eb35e395cb3 | |
| parent | 1b799e9762067f912c0eb807cd5a55d8f122adfd (diff) | |
| parent | 40544a1d5d1a55f88c226213fe464ede8b454fec (diff) | |
| download | zsh-2d964086af95f4b46589459643f20ca00bbb8102.tar.gz zsh-2d964086af95f4b46589459643f20ca00bbb8102.tar.bz2 zsh-2d964086af95f4b46589459643f20ca00bbb8102.zip | |
Merge branch 'patch-ls-g-alias'
Closes #4988
| -rw-r--r-- | lib/theme-and-appearance.zsh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/theme-and-appearance.zsh b/lib/theme-and-appearance.zsh index 122e3fecb..f368a48f0 100644 --- a/lib/theme-and-appearance.zsh +++ b/lib/theme-and-appearance.zsh @@ -21,7 +21,7 @@ if [[ "$DISABLE_LS_COLORS" != "true" ]]; then colorls -G -d . &>/dev/null && alias ls='colorls -G' elif [[ "$OSTYPE" == darwin* ]]; then # 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) # 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)" 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. zstyle ':completion:*' list-colors "${(s.:.)LS_COLORS}" |