refactor: keep using POSIX compatible tr arguments in other shells

Author: moormaster

dist/ColorEcho.bash

@@ -2518,5 +2518,5 @@ function echo.Rainbow() {
   if command -v lolcat > /dev/null 2>&1; then echo "$*" | lolcat; else echo "$*"; fi
 }
 function echo.Reset() {
-  echo "$*" | tr -d \[\:cntrl\:\] | sed -E "s/\\[((;)?[0-9]{1,3}){0,3}m//g" | xargs
+  echo "$*" | tr -d '[:cntrl:]' | sed -E "s/\\[((;)?[0-9]{1,3}){0,3}m//g" | xargs
 }

dist/ColorEcho.fish

@@ -2518,5 +2518,5 @@ function echo.Rainbow
   if command -v lolcat > /dev/null; echo "$argv" | lolcat; else; echo "$argv"; end
 end
 function echo.Reset
-  echo "$argv" | tr -d \[\:cntrl\:\] | sed -E "s/\\[((;)?[0-9]{1,3}){0,3}m//g" | xargs
+  echo "$argv" | tr -d '[:cntrl:]' | sed -E "s/\\[((;)?[0-9]{1,3}){0,3}m//g" | xargs
 end

dist/ColorEcho.ksh

@@ -2518,5 +2518,5 @@ function echoRainbow {
   if command -v lolcat 2> /dev/null >&2; then echo "$*" | lolcat; else echo "$*"; fi
 }
 function echoReset {
-  echo "$*" | tr -d \[\:cntrl\:\] | sed -E "s/\\[((;)?[0-9]{1,3}){0,3}m//g" | xargs
+  echo "$*" | tr -d '[:cntrl:]' | sed -E "s/\\[((;)?[0-9]{1,3}){0,3}m//g" | xargs
 }

dist/ColorEcho.sh

@@ -2525,5 +2525,5 @@ echoRainbow() {
   if command -v lolcat > /dev/null 2>&1; then echo "$*" | lolcat; else echo "$*"; fi
 }
 echoReset() {
-  echo "$*" | tr -d \[\:cntrl\:\] | sed -E "s/\\[((;)?[0-9]{1,3}){0,3}m//g" | xargs
+  echo "$*" | tr -d '[:cntrl:]' | sed -E "s/\\[((;)?[0-9]{1,3}){0,3}m//g" | xargs
 }

dist/ColorEcho.tcsh

@@ -1267,4 +1267,4 @@ alias echo.LightSTULBrown 'echo "\033[9;4;9;38;5;52m\!*\033[m"'
 
 alias echo.LightSTBLBrown 'echo "\033[9;5;9;38;5;52m\!*\033[m"'
 alias echo.Rainbow 'which lolcat >& /dev/null && echo "\!*" | lolcat || echo "\!*"'
-alias echo.Reset 'echo "\!*" | tr -d \[\:cntrl\:\] | sed -E "s/\[((;)?[0-9]{1,3}){0,3}m//g" | xargs'
+alias echo.Reset 'echo "\!*" | tr -d \[:cntrl:\] | sed -E "s/\[((;)?[0-9]{1,3}){0,3}m//g" | xargs'

dist/ColorEcho.zsh

@@ -2518,5 +2518,5 @@ function echo.Rainbow() {
   if command -v lolcat > /dev/null 2>&1; then echo "$*" | lolcat; else echo "$*"; fi
 }
 function echo.Reset() {
-  echo "$*" | tr -d \[\:cntrl\:\] | sed -E "s/\\[((;)?[0-9]{1,3}){0,3}m//g" | xargs
+  echo "$*" | tr -d '[:cntrl:]' | sed -E "s/\\[((;)?[0-9]{1,3}){0,3}m//g" | xargs
 }

generator.sh

@@ -213,15 +213,21 @@ SH_ECHO
     case "${shell}" in
       "fish")
         ifCond='command -v lolcat > /dev/null'
+        trCntrl="'[:cntrl:]'"
         ;;
       "ksh")
         ifCond='command -v lolcat 2> /dev/null >&2'
+        trCntrl="'[:cntrl:]'"
         ;;
       "tcsh")
         ifCond='which lolcat >& /dev/null'
+        # tcsh uses aliases instead of functions
+        # -> remove ' and replace [ and ] with quoted chars
+        trCntrl='\[:cntrl:\]'
         ;;
       *)
         ifCond='command -v lolcat > /dev/null 2>&1'
+        trCntrl="'[:cntrl:]'"
         ;;
     esac
 
@@ -232,7 +238,7 @@ LOLCAT
     # echo.Reset to remove color code on output
     fnName="${fn}echo${dot}Reset${brackets}"
     cat << RESET >> "${tempDist}"
-${fnName}${startSym}echo "${para}" | tr -d \[\:cntrl\:\] | sed -E "s/${escape//\//\/\/}[((;)?[0-9]{1,3}){0,3}m//g" | xargs${endSym}
+${fnName}${startSym}echo "${para}" | tr -d ${trCntrl} | sed -E "s/${escape//\//\/\/}[((;)?[0-9]{1,3}){0,3}m//g" | xargs${endSym}
 RESET
     mv -f "${tempDist}" "${newDist}"
   } &