BSD fix for unsupported ls -G alias and added fallback supprt for colorls as per Issue #836

This commit is contained in:
Rob Dudley 2013-08-13 09:03:57 +01:00
commit f0857e652e

View file

@ -8,9 +8,7 @@ if [ "$DISABLE_LS_COLORS" != "true" ]
then then
# Find the option for using colors in ls, depending on the version: Linux or BSD # Find the option for using colors in ls, depending on the version: Linux or BSD
if [[ $(uname -s) =~ ".*BSD$" ]]; then if [[ $(uname -s) =~ ".*win$" ]]; then
print "BSD"
# On NetBSD, test if "gls" (GNU ls) is installed (this one supports colors); # 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 # 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' || colorls -G . &>/dev/null 2>&1 && alias ls='colorls -G' gls --color -d . &>/dev/null 2>&1 && alias ls='gls --color=tty' || colorls -G . &>/dev/null 2>&1 && alias ls='colorls -G'