diff options
| author | Andrew Janke <andrew@apjanke.net> | 2015-09-23 18:53:05 -0400 |
|---|---|---|
| committer | Andrew Janke <andrew@apjanke.net> | 2015-09-23 18:53:05 -0400 |
| commit | 96ff86142e9037e707f9cde8ab69e0425a0559c6 (patch) | |
| tree | 217cb5e2b4a1c55afec79984c3c3c0a9efe2bf69 /lib/theme-and-appearance.zsh | |
| parent | 502f08b5e19716d43a7ec8b006178a7b017f68cd (diff) | |
| parent | 76a26a2a59d8c6d0f65a4426cdb93920e255aea7 (diff) | |
| download | zsh-96ff86142e9037e707f9cde8ab69e0425a0559c6.tar.gz zsh-96ff86142e9037e707f9cde8ab69e0425a0559c6.tar.bz2 zsh-96ff86142e9037e707f9cde8ab69e0425a0559c6.zip | |
Merge branch 'master' into installer-cygwin-support-3
Conflicts:
tools/install.sh
Diffstat (limited to 'lib/theme-and-appearance.zsh')
| -rw-r--r-- | lib/theme-and-appearance.zsh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/theme-and-appearance.zsh b/lib/theme-and-appearance.zsh index 926303ca4..ebb11fb31 100644 --- a/lib/theme-and-appearance.zsh +++ b/lib/theme-and-appearance.zsh @@ -11,8 +11,11 @@ then # otherwise, leave ls as is, because NetBSD's ls doesn't support -G gls --color -d . &>/dev/null 2>&1 && alias ls='gls --color=tty' elif [[ "$(uname -s)" == "OpenBSD" ]]; then - # On OpenBSD, test if "colorls" is installed (this one supports colors); - # otherwise, leave ls as is, because OpenBSD's ls doesn't support -G + # On OpenBSD, "gls" (ls from GNU coreutils) and "colorls" (ls from base, + # with color and multibyte support) are available from ports. "colorls" + # will be installed on purpose and can't be pulled in by installing + # coreutils, so prefer it to "gls". + gls --color -d . &>/dev/null 2>&1 && alias ls='gls --color=tty' colorls -G -d . &>/dev/null 2>&1 && alias ls='colorls -G' else ls --color -d . &>/dev/null 2>&1 && alias ls='ls --color=tty' || alias ls='ls -G' |