From: Moviuro <moviuro+grml@gmail.com>
Date: Thu, 11 Sep 2014 20:40:09 +0000 (+0200)
Subject: Actually check that ls options exist before adding them to the alias.
X-Git-Tag: v0.10.0~18
X-Git-Url: http://git.grml.org/?p=grml-etc-core.git;a=commitdiff_plain;h=e8f18fbb19cc077695c7a3308654830702fb316a

Actually check that ls options exist before adding them to the alias.
---

diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc
index 9657c72..9ce49ca 100644
--- a/etc/zsh/zshrc
+++ b/etc/zsh/zshrc
@@ -345,9 +345,9 @@ ZSH_NO_DEFAULT_LOCALE=${ZSH_NO_DEFAULT_LOCALE:-0}
 
 typeset -ga ls_options
 typeset -ga grep_options
-if ls --help 2> /dev/null | grep -q GNU; then
+if ls --color=auto / >/dev/null 2>&1; then
     ls_options=( --color=auto )
-elif [[ $OSTYPE == freebsd* ]]; then
+elif ls -G / >/dev/null 2>&1; then
     ls_options=( -G )
 fi
 if grep --help 2> /dev/null | grep -q GNU || \