small refactor and add fish shell support

Author: PeterDaveHello

README.md

@@ -1,5 +1,5 @@
 # ColorEchoForShell
-Make echo colorful with easier method. In [bash](https://www.gnu.org/software/bash/), [sh](https://en.wikipedia.org/wiki/Bourne_shell) and [zsh](http://www.zsh.org/).
+Make echo colorful with easier method. In [bash](https://www.gnu.org/software/bash/), [sh](https://en.wikipedia.org/wiki/Bourne_shell), [fish](http://fishshell.com/) and [zsh](http://www.zsh.org/).
 
 ## Installation
 

generator.sh

@@ -3,8 +3,37 @@
 dist=dist/ColorEcho
 table=table.txt
 
-for shell in sh bash
+for shell in sh bash fish
 do
+    if [ "$shell" = "bash" ]; then
+        fn='function '
+        dot='.'
+        echo='echo'
+        startSym='{'
+        endSym='}'
+        endIf='fi'
+        brackets=
+        para='@'
+    elif [ "$shell" = "fish" ];then
+        fn='function '
+        dot='.'
+        echo='echo'
+        startSym=
+        endSym='end'
+        endIf='end'
+        brackets=
+        para='argv'
+    else
+        fn=
+        dot=
+        echo='/bin/echo'
+        startSym='{'
+        endSym='}'
+        endIf='fi'
+        brackets='()'
+        para='@'
+    fi
+
     newDist="$dist.$shell"
     echo "#!/usr/bin/env $shell" > $newDist
     for color in `cat $table | awk '{print $1}'`
@@ -26,40 +55,36 @@ do
                 for underLine in "" "UL"
                 do
                     echo "" >> $newDist
-                    if [ "$shell" = "bash" ]; then
-                        fn='function '
-                        dot='.'
-                        echo='echo'
-                        brackets=
-                    else
-                        fn=
-                        dot=
-                        echo='/bin/echo'
-                        brackets='()'
-                    fi
-                    echo "$fn""echo$dot$light$bold$underLine$color$brackets" >> $newDist
+                     echo "$fn""echo$dot$light$bold$underLine$color$brackets" >> $newDist
                     if [ "$underLine" = "" ]; then
                         ulCode=
                     else
                         ulCode='4;'
                     fi
-                    echo "{" >> $newDist
-                    echo "    $echo"' -e "\e['"$ulCode$bCode$code"$(grep $color $table | awk '{print $2}')'m$@\e[m"' >> $newDist
-                    echo "}" >> $newDist
+                    echo "$startSym" >> $newDist
+                    echo "    $echo"' -e "\e['"$ulCode$bCode$code"$(grep $color $table | awk '{print $2}')'m$'$para'\e[m"' >> $newDist
+                    echo "$endSym" >> $newDist
                 done
             done
         done
     done
 
-echo "$fn echo"$dot"Rainbow$brackets" >> "$newDist"
+fnName="$fn echo"$dot"Rainbow$brackets"
+if [ "$shell" = "fish" ]; then
+    ifCond="if type lolcat > /dev/null"
+else
+    ifCond='if [ "type lolcat" ]; then'
+fi
+
 cat << LOLCAT >> "$newDist"
-{
-    if [ "type lolcat" ]; then
-        echo "\$@" | lolcat
+$fnName
+$startSym
+    $ifCond
+        echo "\$$para" | lolcat
     else
-        echo "\$@"
-    fi
-}
+        echo "\$$para"
+    $endIf
+$endSym
 LOLCAT
 
 done