Merge pull request #3538 from TheLinuxKitten/grep-if-color

Test if --color=auto is a valid option for grep
thornbird · Feb 22, 2015 · ff6ca9b · ff6ca9b
2 parents e2fd99a + f2130fa
commit ff6ca9b
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/lib/grep.zsh b/lib/grep.zsh
@@ -3,8 +3,12 @@ grep-flag-available() {
     echo | grep $1 "" >/dev/null 2>&1
 }
 
+GREP_OPTIONS=""
+
 # color grep results
-GREP_OPTIONS="--color=auto"
+if grep-flag-available --color=auto; then
+    GREP_OPTIONS+=" --color=auto"
+fi
 
 # ignore VCS folders (if the necessary grep flags are available)
 VCS_FOLDERS="{.bzr,.cvs,.git,.hg,.svn}"