From 176443e75de5451f4160540d65ff94ea1564a2a7 Mon Sep 17 00:00:00 2001
From: Jerry Lee <oldratlee@gmail.com>
Date: Thu, 25 Jan 2024 01:49:01 +0800
Subject: [PATCH] =?UTF-8?q?refactor(`awl`):=20merge=20function=20`colorPri?=
 =?UTF-8?q?nt`=20into=20`rotateColorPrint`=20=F0=9F=9B=A0=EF=B8=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/a2l  | 23 ++++++-----------------
 bin/coat |  2 +-
 bin/taoc |  2 +-
 3 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/bin/a2l b/bin/a2l
index 468c4890..b18c5f7b 100755
--- a/bin/a2l
+++ b/bin/a2l
@@ -19,19 +19,6 @@ readonly PROG_VERSION='2.6.0-dev'
 # util functions
 ################################################################################
 
-colorPrint() {
-  local color=$1
-  shift
-  # if stdout is a terminal, turn on color output.
-  #   '-t' check: is a terminal?
-  #   check isatty in bash https://stackoverflow.com/questions/10022323
-  if [ -t 1 ]; then
-    printf '\e[1;%sm%s\e[0m\n' "$color" "$*"
-  else
-    printf '%s\n' "$*"
-  fi
-}
-
 usage() {
   cat <<EOF
 Usage: $PROG [OPTION]... ARG...
@@ -95,13 +82,15 @@ readonly -a ROTATE_COLORS=(33 35 36 31 32 37 34)
 COUNT=0
 rotateColorPrint() {
   local content=$*
-
-  # skip color for white space
-  if [[ "$content" =~ ^[[:space:]]*$ ]]; then
+  # - if stdout is a terminal, turn on color output.
+  #   '-t' check: is a terminal?
+  #   check isatty in bash https://stackoverflow.com/questions/10022323
+  # - skip color for white space
+  if [[ ! -t 1 || $content =~ ^[[:space:]]*$ ]]; then
     printf '%s\n' "$content"
   else
     local color=${ROTATE_COLORS[COUNT++ % ${#ROTATE_COLORS[@]}]}
-    colorPrint "$color" "$content"
+    printf '\e[1;%sm%s\e[0m\n' "$color" "$content"
   fi
 }
 
diff --git a/bin/coat b/bin/coat
index c1fba865..9eff9922 100755
--- a/bin/coat
+++ b/bin/coat
@@ -22,7 +22,7 @@ COUNT=0
 rotateColorPrint() {
   local content=$*
   # skip color for white space
-  if [[ "$content" =~ ^[[:space:]]*$ ]]; then
+  if [[ $content =~ ^[[:space:]]*$ ]]; then
     printf %s "$content"
   else
     local color=${ROTATE_COLORS[COUNT++ % ${#ROTATE_COLORS[@]}]}
diff --git a/bin/taoc b/bin/taoc
index 4b2c4f76..7a0ebe23 100755
--- a/bin/taoc
+++ b/bin/taoc
@@ -22,7 +22,7 @@ COUNT=0
 rotateColorPrint() {
   local content=$*
   # skip color for white space
-  if [[ "$content" =~ ^[[:space:]]*$ ]]; then
+  if [[ $content =~ ^[[:space:]]*$ ]]; then
     printf %s "$content"
   else
     local color=${ROTATE_COLORS[COUNT++ % ${#ROTATE_COLORS[@]}]}