From f0353dd63d2d75d808a602c3029588b5e9b34d6c Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Fri, 19 Jun 2015 16:09:19 +1200
Subject: Need to actually make LS/GREP_COLORS conditional

---
 sh/profile.d/grep.sh | 12 ++++++++----
 sh/profile.d/ls.sh   | 25 ++++++++++++++++++-------
 2 files changed, 26 insertions(+), 11 deletions(-)

(limited to 'sh')

diff --git a/sh/profile.d/grep.sh b/sh/profile.d/grep.sh
index d8b113c3..444adb16 100644
--- a/sh/profile.d/grep.sh
+++ b/sh/profile.d/grep.sh
@@ -1,10 +1,14 @@
-# Define and store appropriate colors for grep(1)
-GREP_COLORS='ms=01;31:mc=01;31:sl=:cx=:fn=35:ln=32:bn=32:se=36'
-export GREP_COLORS
-
 # Store grep(1)'s --help output in a variable
 grep_help=$(grep --help 2>/dev/null)
 
+# Use GREP_COLORS to add color output to grep(1) if option available
+case $grep_help in
+    *--color*)
+        GREP_COLORS='ms=01;31:mc=01;31:sl=:cx=:fn=35:ln=32:bn=32:se=36'
+        export GREP_COLORS
+        ;;
+esac
+
 # Use GREP_OPTIONS to add some useful options to grep(1) calls if applicable
 GREP_OPTIONS=
 case $grep_help in
diff --git a/sh/profile.d/ls.sh b/sh/profile.d/ls.sh
index 7757f3fe..a477c510 100644
--- a/sh/profile.d/ls.sh
+++ b/sh/profile.d/ls.sh
@@ -1,8 +1,19 @@
-if command -v dircolors >/dev/null 2>&1 ; then
-    if [ -r "$HOME"/.dircolors ] ; then
-        eval "$(dircolors --sh -- "$HOME"/.dircolors)"
-    else
-        eval "$(dircolors --sh)"
-    fi
-fi
+# Store ls(1)'s --help output in a variable
+ls_help=$(ls --help 2>/dev/null)
+
+# Run dircolors(1) to export LS_COLORS if available and appropriate
+case $ls_help in
+    *--color*)
+        if command -v dircolors >/dev/null 2>&1 ; then
+            if [ -r "$HOME"/.dircolors ] ; then
+                eval "$(dircolors --sh -- "$HOME"/.dircolors)"
+            else
+                eval "$(dircolors --sh)"
+            fi
+        fi
+        ;;
+esac
+
+# We're done parsing ls(1)'s --help output now
+unset -v ls_help
 
-- 
cgit v1.2.3