refactor: add if, then, else variables and convert to enable one-line declarations

Author: moormaster

dist/ColorEcho.bash

@@ -2515,11 +2515,7 @@ function echo.LightSTBLBrown() {
   echo -e "\\033[9;5;9;38;5;52m$*\\033[m"
 }
 function echo.Rainbow() {
-  if command -v lolcat > /dev/null 2>&1; then
-    echo "$*" | lolcat
-  else
-    echo "$*"
-  fi
+  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

dist/ColorEcho.fish

@@ -2515,11 +2515,7 @@ function echo.LightSTBLBrown
   echo -e "\\033[9;5;9;38;5;52m$argv\\033[m"
 end
 function echo.Rainbow
-  if command -v lolcat > /dev/null
-    echo "$argv" | lolcat
-  else
-    echo "$argv"
-  end
+  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

dist/ColorEcho.ksh

@@ -2515,11 +2515,7 @@ function echoLightSTBLBrown {
   echo -e "\\033[9;5;9;38;5;52m$*\\033[m"
 }
 function echoRainbow {
-  if command -v lolcat 2> /dev/null >&2; then
-    echo "$*" | lolcat
-  else
-    echo "$*"
-  fi
+  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

dist/ColorEcho.sh

@@ -2522,11 +2522,7 @@ echoLightSTBLBrown() {
   $ECHO "\\033[9;5;9;38;5;52m$*\\033[m"
 }
 echoRainbow() {
-  if command -v lolcat > /dev/null 2>&1; then
-    echo "$*" | lolcat
-  else
-    echo "$*"
-  fi
+  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

dist/ColorEcho.zsh

@@ -2515,11 +2515,7 @@ function echo.LightSTBLBrown() {
   echo -e "\\033[9;5;9;38;5;52m$*\\033[m"
 }
 function echo.Rainbow() {
-  if command -v lolcat > /dev/null 2>&1; then
-    echo "$*" | lolcat
-  else
-    echo "$*"
-  fi
+  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

generator.sh

@@ -38,7 +38,10 @@ for shell in sh bash fish ksh zsh; do
         fn='function '
         dot='.'
         echo='echo -e'
-        endIf='fi'
+        if='if '
+        then='; then '
+        else='; else '
+        endIf='; fi'
         brackets='()'
         para='*'
         startSym=' {
@@ -50,7 +53,10 @@ for shell in sh bash fish ksh zsh; do
         fn='function '
         dot=
         echo='echo -e'
-        endIf='fi'
+        if='if '
+        then='; then '
+        else='; else '
+        endIf='; fi'
         brackets=
         para='*'
         startSym=' {
@@ -62,7 +68,10 @@ for shell in sh bash fish ksh zsh; do
         fn='function '
         dot='.'
         echo='echo -e'
-        endIf='end'
+        if='if '
+        then='; '
+        else='; else; '
+        endIf='; end'
         brackets=
         para='argv'
         startSym='
@@ -75,7 +84,10 @@ end'
         dot=
         # shellcheck disable=SC2016
         echo='$ECHO'
-        endIf='fi'
+        if='if '
+        then='; then '
+        else='; else '
+        endIf='; fi'
         brackets='()'
         para='*'
         startSym=' {
@@ -178,22 +190,18 @@ SH_ECHO
     fnName="${fn}echo${dot}Rainbow${brackets}"
     case "${shell}" in
       "fish")
-        ifCond="if command -v lolcat > /dev/null"
+        ifCond='command -v lolcat > /dev/null'
         ;;
       "ksh")
-        ifCond='if command -v lolcat 2> /dev/null >&2; then'
+        ifCond='command -v lolcat 2> /dev/null >&2'
         ;;
       *)
-        ifCond='if command -v lolcat > /dev/null 2>&1; then'
+        ifCond='command -v lolcat > /dev/null 2>&1'
         ;;
     esac
 
     cat << LOLCAT >> "${tempDist}"
-${fnName}${startSym}${ifCond}
-    echo "\$${para}" | lolcat
-  else
-    echo "\$${para}"
-  ${endIf}${endSym}
+${fnName}${startSym}${if}${ifCond}${then}echo "\$${para}" | lolcat${else}echo "\$${para}"${endIf}${endSym}
 LOLCAT
 
     # echo.Reset to remove color code on output