do colors properly - store the actual escape codes in the color variables, not literal '\033' stuff

1 files changed, 39 insertions, 18 deletions

diff --git a/bash/colors b/bash/colors
index bad7238..12e5a31 100644
--- a/bash/colors
+++ b/bash/colors
@@ -1,18 +1,39 @@
-GRAY="\033[0;30m"
-BLACK="\033[1;30m"
-RED="\033[0;31m"
-HIRED="\033[1;31m"
-GREEN="\033[0;32m"
-HIGREEN="\033[1;32m"
-YELLOW="\033[0;33m"
-HIYELLOW="\033[1;33m"
-BLUE="\033[0;34m"
-HIBLUE="\033[1;34m"
-MAGENTA="\033[0;35m"
-HIMAGENTA="\033[1;35m"
-CYAN="\033[0;36m"
-HICYAN="\033[1;36m"
-WHITE="\033[0;37m"
-HIWHITE="\033[1;37m"
-BOLD="\033[0;39m"
-NORM="\033[0m"
+if [[ -n "$(which tput)" && "$(__tmp=$(tput setf 0); echo $?)" == "0" ]]; then
+    GRAY=$(tput setf 8)
+    BLACK=$(tput setf 0)
+    RED=$(tput setf 4)
+    HIRED=$(tput setf 9)
+    GREEN=$(tput setf 2)
+    HIGREEN=$(tput setf 10)
+    YELLOW=$(tput setf 6)
+    HIYELLOW=$(tput setf 11)
+    BLUE=$(tput setf 1)
+    HIBLUE=$(tput setf 12)
+    MAGENTA=$(tput setf 5)
+    HIMAGENTA=$(tput setf 13)
+    CYAN=$(tput setf 3)
+    HICYAN=$(tput setf 14)
+    WHITE=$(tput setf 7)
+    HIWHITE=$(tput setf 15)
+    BOLD=$(tput bold)
+    NORM=$(tput sgr0)
+else
+    GRAY=$(printf "\033[0;30m")
+    BLACK=$(printf "\033[1;30m")
+    RED=$(printf "\033[0;31m")
+    HIRED=$(printf "\033[1;31m")
+    GREEN=$(printf "\033[0;32m")
+    HIGREEN=$(printf "\033[1;32m")
+    YELLOW=$(printf "\033[0;33m")
+    HIYELLOW=$(printf "\033[1;33m")
+    BLUE=$(printf "\033[0;34m")
+    HIBLUE=$(printf "\033[1;34m")
+    MAGENTA=$(printf "\033[0;35m")
+    HIMAGENTA=$(printf "\033[1;35m")
+    CYAN=$(printf "\033[0;36m")
+    HICYAN=$(printf "\033[1;36m")
+    WHITE=$(printf "\033[0;37m")
+    HIWHITE=$(printf "\033[1;37m")
+    BOLD=$(printf "\033[0;39m")
+    NORM=$(printf "\033[0m")
+fi