浏览代码

Fixed issue with NetBSD's ls

Cosmin Lu?ă 12 年之前
父节点
当前提交
fa355a798c
共有 1 个文件被更改,包括 8 次插入1 次删除
  1. 8 1
      lib/theme-and-appearance.zsh

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

@@ -7,7 +7,14 @@ 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