diff options
| author | Ramses Ladlani <ramses.ladlani@fishingcactus.com> | 2015-09-21 08:49:18 +0200 |
|---|---|---|
| committer | Ramses Ladlani <ramses.ladlani@fishingcactus.com> | 2015-09-21 08:49:18 +0200 |
| commit | 7576f856b915e6e02c5990cd7e221d7b9efbe44a (patch) | |
| tree | be3fe162edbc04946eea014a3612280d4909dc1e /lib/theme-and-appearance.zsh | |
| parent | 6e0fcf803fe00445c97861360d1b0806d8cc56b8 (diff) | |
| parent | 918d26e7dbcb907e673df24242c9688cd89019b9 (diff) | |
| download | zsh-7576f856b915e6e02c5990cd7e221d7b9efbe44a.tar.gz zsh-7576f856b915e6e02c5990cd7e221d7b9efbe44a.tar.bz2 zsh-7576f856b915e6e02c5990cd7e221d7b9efbe44a.zip | |
Merge remote-tracking branch 'robyrussel/master' into fix-atom_plugin_for_cygwin
Discarded all previous changes to atom plugin for easier review in next commit.
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' |