From e148cb4ec090da55cfc3f00dc1631900e48e0892 Mon Sep 17 00:00:00 2001
From: Aaron LI <aly@aaronly.me>
Date: Fri, 3 Nov 2017 18:51:22 +0800
Subject: Update termcolors1 to not depend on bash; update termcolors2 a bit

---
 unix/termcolors1.bash | 40 ------------------------------
 unix/termcolors1.sh   | 41 +++++++++++++++++++++++++++++++
 unix/termcolors2.bash | 68 +++++++++++++++++++++++++++++++--------------------
 3 files changed, 83 insertions(+), 66 deletions(-)
 delete mode 100755 unix/termcolors1.bash
 create mode 100755 unix/termcolors1.sh

diff --git a/unix/termcolors1.bash b/unix/termcolors1.bash
deleted file mode 100755
index f9efa62..0000000
--- a/unix/termcolors1.bash
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/env bash
-#
-# * https://gist.github.com/esundahl/1651086
-# * https://wiki.archlinux.org/index.php/X_resources
-#
-
-function color_test {
-    # Daniel Crisman's ANSI color chart script from
-    # The Bash Prompt HOWTO: 6.1. Colours
-    # http://www.tldp.org/HOWTO/Bash-Prompt-HOWTO/x329.html
-    #
-    # This function echoes a bunch of color codes to the
-    # terminal to demonstrate what's available. Each
-    # line is the color code of one forground color,
-    # out of 17 (default + 16 escapes), followed by a
-    # test use of that color on all nine background
-    # colors (default + 8 escapes).
-    #
-    
-    T='gYw'  # The test text
-    
-    echo -e "\n                 40m     41m     42m     43m\
-     44m     45m     46m     47m"
-    
-    for FGs in '    m' '   1m' '  30m' '1;30m' '  31m' '1;31m' \
-               '  32m' '1;32m' '  33m' '1;33m' '  34m' '1;34m' \
-               '  35m' '1;35m' '  36m' '1;36m' '  37m' '1;37m';
-    do
-        FG=${FGs// /}
-        echo -en " $FGs \033[$FG  $T  "
-        for BG in 40m 41m 42m 43m 44m 45m 46m 47m; do
-            echo -en "$EINS \033[$FG\033[$BG  $T  \033[0m"
-        done
-        echo;
-    done
-    echo
-}
-
-color_test
-
diff --git a/unix/termcolors1.sh b/unix/termcolors1.sh
new file mode 100755
index 0000000..23c4f06
--- /dev/null
+++ b/unix/termcolors1.sh
@@ -0,0 +1,41 @@
+#!/bin/sh
+#
+# * https://gist.github.com/esundahl/1651086
+# * https://wiki.archlinux.org/index.php/X_resources
+#
+
+color_test() {
+    # Daniel Crisman's ANSI color chart script from
+    # The Bash Prompt HOWTO: 6.1. Colours
+    # http://www.tldp.org/HOWTO/Bash-Prompt-HOWTO/x329.html
+    #
+    # This function echoes a bunch of color codes to the
+    # terminal to demonstrate what's available. Each
+    # line is the color code of one forground color,
+    # out of 17 (default + 16 escapes), followed by a
+    # test use of that color on all nine background
+    # colors (default + 8 escapes).
+    #
+    
+    T="gYw"  # The test text
+    
+    echo
+    echo "                 40m     41m     42m     43m\
+     44m     45m     46m     47m"
+    
+    for FGs in '    m' '   1m' '  30m' '1;30m' '  31m' '1;31m' \
+               '  32m' '1;32m' '  33m' '1;33m' '  34m' '1;34m' \
+               '  35m' '1;35m' '  36m' '1;36m' '  37m' '1;37m';
+    do
+        FG=`echo "${FGs}" | tr -d ' '`
+        echo -n " $FGs \033[$FG  $T  "
+        for BG in 40m 41m 42m 43m 44m 45m 46m 47m; do
+            echo -n "$EINS \033[$FG\033[$BG  $T  \033[0m"
+        done
+        echo
+    done
+    echo
+}
+
+color_test
+
diff --git a/unix/termcolors2.bash b/unix/termcolors2.bash
index 4dc2ef2..def8b3e 100755
--- a/unix/termcolors2.bash
+++ b/unix/termcolors2.bash
@@ -1,32 +1,48 @@
 #!/usr/bin/env bash
-# Original: http://frexx.de/xterm-256-notes/
-#           http://frexx.de/xterm-256-notes/data/colortable16.sh
-# Modified by Aaron Griffin
-# and further by Kazuo Teramoto
+#
+# Credits:
+# [1] http://frexx.de/xterm-256-notes/data/colortable16.sh
+# [2] https://wiki.archlinux.org/index.php/X_resources
+#
+# Modified by Aaron Griffin, and Kazuo Teramoto
+#
+
+
 FGNAMES=(' black ' '  red  ' ' green ' ' yellow' '  blue ' 'magenta' '  cyan ' ' white ')
 BGNAMES=('DFT' 'BLK' 'RED' 'GRN' 'YEL' 'BLU' 'MAG' 'CYN' 'WHT')
-
+#echo "     ----------------------------------------------------------------------------"
 echo "     ┌──────────────────────────────────────────────────────────────────────────┐"
-for b in {0..8}; do
-  ((b>0)) && bg=$((b+39))
-
-  echo -en "\033[0m ${BGNAMES[b]} │ "
-  
-  for f in {0..7}; do
-    echo -en "\033[${bg}m\033[$((f+30))m ${FGNAMES[f]} "
-  done
-  
-  echo -en "\033[0m │"
-  echo -en "\033[0m\n\033[0m     │ "
-  
-  for f in {0..7}; do
-    echo -en "\033[${bg}m\033[1;$((f+30))m ${FGNAMES[f]} "
-  done
-
-  echo -en "\033[0m │"
-  echo -e "\033[0m"
-
-  ((b<8)) &&
-  echo "     ├──────────────────────────────────────────────────────────────────────────┤"
+for b in $(seq 0 8); do
+    if [ "$b" -gt 0 ]; then
+        bg=$(($b+39))
+    fi
+
+    #echo -en "\033[0m ${BGNAMES[$b]} : "
+    echo -en "\033[0m ${BGNAMES[$b]} │ "
+
+    for f in $(seq 0 7); do
+        fg=$(($f+30))
+        echo -en "\033[${bg}m\033[${fg}m ${FGNAMES[$f]} "
+    done
+
+    #echo -en "\033[0m :"
+    #echo -en "\033[0m\n\033[0m     : "
+    echo -en "\033[0m │"
+    echo -en "\033[0m\n\033[0m     │ "
+
+    for f in $(seq 0 7); do
+        fg=$(($f+30))
+        echo -en "\033[${bg}m\033[1;${fg}m ${FGNAMES[$f]} "
+    done
+
+    #echo -en "\033[0m :"
+    echo -en "\033[0m │"
+    echo -e "\033[0m"
+
+  if [ "$b" -lt 8 ]; then
+    #echo "     ----------------------------------------------------------------------------"
+    echo "     ├──────────────────────────────────────────────────────────────────────────┤"
+  fi
 done
+#echo "     ----------------------------------------------------------------------------"
 echo "     └──────────────────────────────────────────────────────────────────────────┘"
-- 
cgit v1.2.2