summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAtem18 <messer.kevin@gmail.com>2013-12-01 23:45:55 +0100
committerAtem18 <messer.kevin@gmail.com>2013-12-01 23:45:55 +0100
commit06bd72f842480d9556a1cc28cc340f1be7e7c79b (patch)
treebaeb90abad8afab94f0535fe8f949b1d8df591be /lib
parent84e178fa3d5e6e5bc36cb353c5c051d4f12ec35d (diff)
parent5643fac8870c2df284f1ccceab35fb1fe343fa3f (diff)
downloadzsh-06bd72f842480d9556a1cc28cc340f1be7e7c79b.tar.gz
zsh-06bd72f842480d9556a1cc28cc340f1be7e7c79b.tar.bz2
zsh-06bd72f842480d9556a1cc28cc340f1be7e7c79b.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'lib')
-rw-r--r--lib/theme-and-appearance.zsh4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/theme-and-appearance.zsh b/lib/theme-and-appearance.zsh
index 2677615c0..0353f9db4 100644
--- a/lib/theme-and-appearance.zsh
+++ b/lib/theme-and-appearance.zsh
@@ -11,6 +11,10 @@ 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 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
+ 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'
fi