From 20abda5ffe737f008f8b097450e18807c06ce8ad Mon Sep 17 00:00:00 2001
From: Anmol Sethi <anmol@terrastruct.com>
Date: Wed, 30 Nov 2022 22:39:46 -0800
Subject: [PATCH] ci/sub: Update

---
 ci/release/template/scripts/lib.sh | 5 +++--
 install.sh                         | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ci/release/template/scripts/lib.sh b/ci/release/template/scripts/lib.sh
index 3dc704bb0..486d25ac6 100644
--- a/ci/release/template/scripts/lib.sh
+++ b/ci/release/template/scripts/lib.sh
@@ -66,7 +66,7 @@ should_color() {
     fi
   fi
 
-  if [ -t 1 ]; then
+  if [ -t 1 -a "${TERM-}" != dumb ]; then
     _COLOR=1
     return 0
   else
@@ -89,7 +89,8 @@ _echo() {
 get_rand_color() {
   # 1-6 are regular and 9-14 are bright.
   # 1,2 and 9,10 are red and green but we use those for success and failure.
-  pick "$*" 3 4 5 6 11 12 13 14
+  pick "$*" 1 2 3 4 5 6 \
+            9 10 11 12 13 14
 }
 
 echop() {
diff --git a/install.sh b/install.sh
index 7afad1716..7dca28652 100755
--- a/install.sh
+++ b/install.sh
@@ -72,7 +72,7 @@ should_color() {
     fi
   fi
 
-  if [ -t 1 ]; then
+  if [ -t 1 -a "${TERM-}" != dumb ]; then
     _COLOR=1
     return 0
   else
@@ -95,7 +95,8 @@ _echo() {
 get_rand_color() {
   # 1-6 are regular and 9-14 are bright.
   # 1,2 and 9,10 are red and green but we use those for success and failure.
-  pick "$*" 3 4 5 6 11 12 13 14
+  pick "$*" 1 2 3 4 5 6 \
+            9 10 11 12 13 14
 }
 
 echop() {