From ab6cb2673a51f8582e82828b15fd62f303f54d75 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Tue, 11 Jul 2017 23:57:23 +1200
Subject: Gracefully handle two failed tput color calls

---
 sh/shrc.d/grep.sh | 2 +-
 sh/shrc.d/ls.sh   | 2 +-
 sh/shrc.d/tree.sh | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'sh')

diff --git a/sh/shrc.d/grep.sh b/sh/shrc.d/grep.sh
index dd85a198..3df1ee9a 100644
--- a/sh/shrc.d/grep.sh
+++ b/sh/shrc.d/grep.sh
@@ -14,7 +14,7 @@ grep() {
 
     # Add --color=auto if the terminal has at least 8 colors
     [ -e "$HOME"/.cache/sh/opt/grep/color ] &&
-    [ "$({ tput colors || tput Co ; } 2>/dev/null)" -ge 8 ] &&
+    [ "$({ tput colors||tput Co||echo 0; } 2>/dev/null)" -ge 8 ] &&
         set -- --color=auto "$@"
 
     # Add --devices=skip to gracefully skip devices
diff --git a/sh/shrc.d/ls.sh b/sh/shrc.d/ls.sh
index b5acfcf9..d58c64f9 100644
--- a/sh/shrc.d/ls.sh
+++ b/sh/shrc.d/ls.sh
@@ -25,7 +25,7 @@ ls() {
 
     # Add --color if the terminal has at least 8 colors
     [ -e "$HOME"/.cache/sh/opt/ls/color ] &&
-    [ "$({ tput colors || tput Co ; } 2>/dev/null)" -ge 8 ] &&
+    [ "$({ tput colors||tput Co||echo 0; } 2>/dev/null)" -ge 8 ] &&
         set -- --color=auto "$@"
 
     # Add --time-style='+%Y-%m-%d %H:%M:%S' to show the date in my preferred
diff --git a/sh/shrc.d/tree.sh b/sh/shrc.d/tree.sh
index b4f91df8..ca134fe2 100644
--- a/sh/shrc.d/tree.sh
+++ b/sh/shrc.d/tree.sh
@@ -21,7 +21,7 @@ tree() {
         [ -t 1 ] || exit
 
         # Not if output terminal doesn't have at least 8 colors
-        [ "$({ tput colors || tput Co ; } 2>/dev/null)" -ge 8 ] || exit
+        [ "$({ tput colors||tput Co||echo 0; } 2>/dev/null)" -ge 8 ]
 
     ) ; then
         set -- -C "$@"
-- 
cgit v1.2.3