diff options
| author | Marc Cornellà <marc.cornella@live.com> | 2016-10-11 09:24:43 +0200 |
|---|---|---|
| committer | Marc Cornellà <marc.cornella@live.com> | 2016-10-11 09:24:43 +0200 |
| commit | c24dfa1ab4abb1f28fad7666f3bc24f3abced801 (patch) | |
| tree | b319c4f1b1bfd7df1e00b7256a6d7a74dc77517e /lib/theme-and-appearance.zsh | |
| parent | 628d0bb10664453fe55c1e725ab89fa42dc4ab0a (diff) | |
| download | zsh-c24dfa1ab4abb1f28fad7666f3bc24f3abced801.tar.gz zsh-c24dfa1ab4abb1f28fad7666f3bc24f3abced801.tar.bz2 zsh-c24dfa1ab4abb1f28fad7666f3bc24f3abced801.zip | |
Fix ls coloring in MacOS if gls is not installed
Fixes #5520.
Diffstat (limited to 'lib/theme-and-appearance.zsh')
| -rw-r--r-- | lib/theme-and-appearance.zsh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/theme-and-appearance.zsh b/lib/theme-and-appearance.zsh index 0fd3c44db..467b770d6 100644 --- a/lib/theme-and-appearance.zsh +++ b/lib/theme-and-appearance.zsh @@ -6,7 +6,7 @@ export LSCOLORS="Gxfxcxdxbxegedabagacad" if [[ "$DISABLE_LS_COLORS" != "true" ]]; then # Find the option for using colors in ls, depending on the version - if [[ "$OSTYPE" == netbsd* ]] || [[ "$OSTYPE" == darwin* ]]; then + if [[ "$OSTYPE" == netbsd* ]]; then # On NetBSD, test if "gls" (GNU ls) is installed (this one supports colors); # otherwise, leave ls as is, because NetBSD's ls doesn't support -G gls --color -d . &>/dev/null && alias ls='gls --color=tty' @@ -17,6 +17,8 @@ if [[ "$DISABLE_LS_COLORS" != "true" ]]; then # coreutils, so prefer it to "gls". gls --color -d . &>/dev/null && alias ls='gls --color=tty' colorls -G -d . &>/dev/null && alias ls='colorls -G' + elif [[ "$OSTYPE" == darwin* ]]; then + gls --color -d . &>/dev/null && alias ls='gls --color=tty' || alias ls='ls -G' else # For GNU ls, we use the default ls color theme. They can later be overwritten by themes. if [[ -z "$LS_COLORS" ]]; then |