Browse Source

Merge pull request #1531 from lcosmin/master

Fixed 'ls' issue on NetBSD
Robby Russell 11 years ago
parent
commit
085af13b47
1 changed files with 7 additions and 1 deletions
  1. 7 1
      lib/theme-and-appearance.zsh

+ 7 - 1
lib/theme-and-appearance.zsh

@@ -7,7 +7,13 @@ export LSCOLORS="Gxfxcxdxbxegedabagacad"
 if [ "$DISABLE_LS_COLORS" != "true" ]
 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
-  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
 fi
 
 
 #setopt no_beep
 #setopt no_beep