From d2020a162649b00fbab66283c61cb57985c3cc4f Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Fri, 26 Aug 2016 14:03:41 +1200
Subject: Improvements to tree() to handle color options

---
 sh/shrc.d/tree.sh | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

(limited to 'sh/shrc.d/tree.sh')

diff --git a/sh/shrc.d/tree.sh b/sh/shrc.d/tree.sh
index 5feb8ca3..dd78f8ee 100644
--- a/sh/shrc.d/tree.sh
+++ b/sh/shrc.d/tree.sh
@@ -2,8 +2,30 @@
 # color its output by default without it; this will coax it into doing so with
 # the default colors when writing to a terminal.
 tree() {
-    [ -t 1 ] &&
-    [ "$({ tput colors || tput Co ; } 2>/dev/null)" -ge 8 ] &&
+
+    # Subshell will run the tests to check if we should color the output
+    if (
+
+        # Not if -n is in the arguments and -C isn't
+        while getopts 'nC' opt ; do
+            case $opt in
+                n) n=1 ;;
+                C) C=1 ;;
+            esac
+        done
+        [ -z "$C" ] || exit 0
+        [ -z "$n" ] || exit 1
+
+        # Not if output isn't a terminal
+        [ -t 1 ] || exit
+
+        # Not if output terminal doesn't have at least 8 colors
+        [ "$({ tput colors || tput Co ; } 2>/dev/null)" -ge 8 ] || exit
+
+    ) ; then
         set -- -C "$@"
-    command "$@"
+    fi
+
+    # Run the command with the determined arguments
+    command tree "$@"
 }
-- 
cgit v1.2.3