From da68dde71bce10064a855dfe76480086d7da8449 Mon Sep 17 00:00:00 2001 From: Rob Dudley Date: Tue, 13 Aug 2013 09:01:57 +0100 Subject: [PATCH 1/3] BSD fix for unsupported ls -G alias and added fallback supprt for colorls as per Issue #836 --- lib/theme-and-appearance.zsh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/theme-and-appearance.zsh b/lib/theme-and-appearance.zsh index 2677615c0..eb66caef4 100644 --- a/lib/theme-and-appearance.zsh +++ b/lib/theme-and-appearance.zsh @@ -6,11 +6,14 @@ export LSCOLORS="Gxfxcxdxbxegedabagacad" # Enable ls colors if [ "$DISABLE_LS_COLORS" != "true" ] then + UNAME=$(uname -s) # Find the option for using colors in ls, depending on the version: Linux or BSD - if [[ "$(uname -s)" == "NetBSD" ]]; then + if [[ $UNAME =~ ".*BSD$" ]]; then + + print "BSD" # 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' + gls --color -d . &>/dev/null 2>&1 && alias ls='gls --color=tty' || colorls -G . &>/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 From 275ffcec9579ea842da2b7fdaaad910981045477 Mon Sep 17 00:00:00 2001 From: Rob Dudley Date: Tue, 13 Aug 2013 09:03:17 +0100 Subject: [PATCH 2/3] BSD fix for unsupported ls -G alias and added fallback supprt for colorls as per Issue #836 --- lib/theme-and-appearance.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/theme-and-appearance.zsh b/lib/theme-and-appearance.zsh index eb66caef4..12e08753c 100644 --- a/lib/theme-and-appearance.zsh +++ b/lib/theme-and-appearance.zsh @@ -6,9 +6,9 @@ export LSCOLORS="Gxfxcxdxbxegedabagacad" # Enable ls colors if [ "$DISABLE_LS_COLORS" != "true" ] then - UNAME=$(uname -s) + # Find the option for using colors in ls, depending on the version: Linux or BSD - if [[ $UNAME =~ ".*BSD$" ]]; then + if [[ $(uname -s) =~ ".*BSD$" ]]; then print "BSD" # On NetBSD, test if "gls" (GNU ls) is installed (this one supports colors); From f0857e652e38a5159369dcbd168bf1fda4f8a026 Mon Sep 17 00:00:00 2001 From: Rob Dudley Date: Tue, 13 Aug 2013 09:03:57 +0100 Subject: [PATCH 3/3] BSD fix for unsupported ls -G alias and added fallback supprt for colorls as per Issue #836 --- lib/theme-and-appearance.zsh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/theme-and-appearance.zsh b/lib/theme-and-appearance.zsh index 12e08753c..840d3867c 100644 --- a/lib/theme-and-appearance.zsh +++ b/lib/theme-and-appearance.zsh @@ -8,9 +8,7 @@ if [ "$DISABLE_LS_COLORS" != "true" ] then # Find the option for using colors in ls, depending on the version: Linux or BSD - if [[ $(uname -s) =~ ".*BSD$" ]]; then - - print "BSD" + if [[ $(uname -s) =~ ".*win$" ]]; 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' || colorls -G . &>/dev/null 2>&1 && alias ls='colorls -G'