Permalink
Browse files

Merge pull request #1531 from lcosmin/master

Fixed 'ls' issue on NetBSD
  • Loading branch information...
2 parents d4fb254 + e5736d3 commit 085af13b47724bdd4aad55bb706303013dc6240c @robbyrussell committed Apr 12, 2013
Showing with 7 additions and 1 deletion.
  1. +7 −1 lib/theme-and-appearance.zsh
View
8 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

0 comments on commit 085af13

Please sign in to comment.