summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrm00 <jasmintee@gmx.de>2014-04-25 14:15:14 +0200
committerdrm00 <jasmintee@gmx.de>2014-04-25 14:15:14 +0200
commitf516b7c7f5e630ab04d31e5f7da5f443b21f173f (patch)
tree66d3f6c917d92a8f53426536d53310b8a5b7d36e
parenteafd5f325208421b82a770e57441dd1063eb5745 (diff)
downloadzsh-f516b7c7f5e630ab04d31e5f7da5f443b21f173f.tar.gz
zsh-f516b7c7f5e630ab04d31e5f7da5f443b21f173f.tar.bz2
zsh-f516b7c7f5e630ab04d31e5f7da5f443b21f173f.zip
add check for colored ls on openbsd. (retry of #2225)
-rw-r--r--lib/theme-and-appearance.zsh7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/theme-and-appearance.zsh b/lib/theme-and-appearance.zsh
index 0353f9db4..2c6d4912c 100644
--- a/lib/theme-and-appearance.zsh
+++ b/lib/theme-and-appearance.zsh
@@ -12,8 +12,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'