Skip to content

Commit

Permalink
Merge pull request ohmyzsh#1531 from lcosmin/master
Browse files Browse the repository at this point in the history
Fixed 'ls' issue on NetBSD
  • Loading branch information
robbyrussell committed Apr 12, 2013
2 parents d4fb254 + e5736d3 commit 085af13
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion lib/theme-and-appearance.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 085af13

Please sign in to comment.