diff options
| author | Robby Russell <robby@planetargon.com> | 2013-04-12 06:16:54 -0700 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2013-04-12 06:16:54 -0700 |
| commit | 085af13b47724bdd4aad55bb706303013dc6240c (patch) | |
| tree | 79f3f6178901beca282b245138aac494ebd1fdd1 /lib | |
| parent | d4fb254d28a6621d08cfed124ad321ce18f3ad03 (diff) | |
| parent | e5736d39103c59b115270dcf91d31419d3f08130 (diff) | |
| download | zsh-085af13b47724bdd4aad55bb706303013dc6240c.tar.gz zsh-085af13b47724bdd4aad55bb706303013dc6240c.tar.bz2 zsh-085af13b47724bdd4aad55bb706303013dc6240c.zip | |
Merge pull request #1531 from lcosmin/master
Fixed 'ls' issue on NetBSD
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/theme-and-appearance.zsh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/theme-and-appearance.zsh b/lib/theme-and-appearance.zsh index aec67721a..2677615c0 100644 --- a/lib/theme-and-appearance.zsh +++ b/lib/theme-and-appearance.zsh @@ -7,7 +7,13 @@ export LSCOLORS="Gxfxcxdxbxegedabagacad" if [ "$DISABLE_LS_COLORS" != "true" ] then # Find the option for using colors in ls, depending on the version: Linux or BSD - ls --color -d . &>/dev/null 2>&1 && alias ls='ls --color=tty' || alias ls='ls -G' + if [[ "$(uname -s)" == "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 2>&1 && alias ls='gls --color=tty' + else + ls --color -d . &>/dev/null 2>&1 && alias ls='ls --color=tty' || alias ls='ls -G' + fi fi #setopt no_beep |