From 9bdbe990b074edfa25d98eeddf82040ca183686d Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Tue, 9 Jun 2015 06:06:07 +0800 Subject: [PATCH] fix bug, $1 should be $@ --- dist/colorEcho.sh | 96 +++++++++++++++++++++++------------------------ gen.sh | 2 +- 2 files changed, 49 insertions(+), 49 deletions(-) diff --git a/dist/colorEcho.sh b/dist/colorEcho.sh index b770f84..de115b9 100644 --- a/dist/colorEcho.sh +++ b/dist/colorEcho.sh @@ -2,240 +2,240 @@ function echo.Red() { - echo -e "\e[31m$1\e[m" + echo -e "\e[31m$@\e[m" } function echo.ULRed() { - echo -e "\e[4;31m$1\e[m" + echo -e "\e[4;31m$@\e[m" } function echo.BoldRed() { - echo -e "\e[1;31m$1\e[m" + echo -e "\e[1;31m$@\e[m" } function echo.BoldULRed() { - echo -e "\e[4;1;31m$1\e[m" + echo -e "\e[4;1;31m$@\e[m" } function echo.LightRed() { - echo -e "\e[91m$1\e[m" + echo -e "\e[91m$@\e[m" } function echo.LightULRed() { - echo -e "\e[4;91m$1\e[m" + echo -e "\e[4;91m$@\e[m" } function echo.LightBoldRed() { - echo -e "\e[1;91m$1\e[m" + echo -e "\e[1;91m$@\e[m" } function echo.LightBoldULRed() { - echo -e "\e[4;1;91m$1\e[m" + echo -e "\e[4;1;91m$@\e[m" } function echo.Green() { - echo -e "\e[32m$1\e[m" + echo -e "\e[32m$@\e[m" } function echo.ULGreen() { - echo -e "\e[4;32m$1\e[m" + echo -e "\e[4;32m$@\e[m" } function echo.BoldGreen() { - echo -e "\e[1;32m$1\e[m" + echo -e "\e[1;32m$@\e[m" } function echo.BoldULGreen() { - echo -e "\e[4;1;32m$1\e[m" + echo -e "\e[4;1;32m$@\e[m" } function echo.LightGreen() { - echo -e "\e[92m$1\e[m" + echo -e "\e[92m$@\e[m" } function echo.LightULGreen() { - echo -e "\e[4;92m$1\e[m" + echo -e "\e[4;92m$@\e[m" } function echo.LightBoldGreen() { - echo -e "\e[1;92m$1\e[m" + echo -e "\e[1;92m$@\e[m" } function echo.LightBoldULGreen() { - echo -e "\e[4;1;92m$1\e[m" + echo -e "\e[4;1;92m$@\e[m" } function echo.Yellow() { - echo -e "\e[33m$1\e[m" + echo -e "\e[33m$@\e[m" } function echo.ULYellow() { - echo -e "\e[4;33m$1\e[m" + echo -e "\e[4;33m$@\e[m" } function echo.BoldYellow() { - echo -e "\e[1;33m$1\e[m" + echo -e "\e[1;33m$@\e[m" } function echo.BoldULYellow() { - echo -e "\e[4;1;33m$1\e[m" + echo -e "\e[4;1;33m$@\e[m" } function echo.LightYellow() { - echo -e "\e[93m$1\e[m" + echo -e "\e[93m$@\e[m" } function echo.LightULYellow() { - echo -e "\e[4;93m$1\e[m" + echo -e "\e[4;93m$@\e[m" } function echo.LightBoldYellow() { - echo -e "\e[1;93m$1\e[m" + echo -e "\e[1;93m$@\e[m" } function echo.LightBoldULYellow() { - echo -e "\e[4;1;93m$1\e[m" + echo -e "\e[4;1;93m$@\e[m" } function echo.Blue() { - echo -e "\e[34m$1\e[m" + echo -e "\e[34m$@\e[m" } function echo.ULBlue() { - echo -e "\e[4;34m$1\e[m" + echo -e "\e[4;34m$@\e[m" } function echo.BoldBlue() { - echo -e "\e[1;34m$1\e[m" + echo -e "\e[1;34m$@\e[m" } function echo.BoldULBlue() { - echo -e "\e[4;1;34m$1\e[m" + echo -e "\e[4;1;34m$@\e[m" } function echo.LightBlue() { - echo -e "\e[94m$1\e[m" + echo -e "\e[94m$@\e[m" } function echo.LightULBlue() { - echo -e "\e[4;94m$1\e[m" + echo -e "\e[4;94m$@\e[m" } function echo.LightBoldBlue() { - echo -e "\e[1;94m$1\e[m" + echo -e "\e[1;94m$@\e[m" } function echo.LightBoldULBlue() { - echo -e "\e[4;1;94m$1\e[m" + echo -e "\e[4;1;94m$@\e[m" } function echo.Magenta() { - echo -e "\e[35m$1\e[m" + echo -e "\e[35m$@\e[m" } function echo.ULMagenta() { - echo -e "\e[4;35m$1\e[m" + echo -e "\e[4;35m$@\e[m" } function echo.BoldMagenta() { - echo -e "\e[1;35m$1\e[m" + echo -e "\e[1;35m$@\e[m" } function echo.BoldULMagenta() { - echo -e "\e[4;1;35m$1\e[m" + echo -e "\e[4;1;35m$@\e[m" } function echo.LightMagenta() { - echo -e "\e[95m$1\e[m" + echo -e "\e[95m$@\e[m" } function echo.LightULMagenta() { - echo -e "\e[4;95m$1\e[m" + echo -e "\e[4;95m$@\e[m" } function echo.LightBoldMagenta() { - echo -e "\e[1;95m$1\e[m" + echo -e "\e[1;95m$@\e[m" } function echo.LightBoldULMagenta() { - echo -e "\e[4;1;95m$1\e[m" + echo -e "\e[4;1;95m$@\e[m" } function echo.Cyan() { - echo -e "\e[36m$1\e[m" + echo -e "\e[36m$@\e[m" } function echo.ULCyan() { - echo -e "\e[4;36m$1\e[m" + echo -e "\e[4;36m$@\e[m" } function echo.BoldCyan() { - echo -e "\e[1;36m$1\e[m" + echo -e "\e[1;36m$@\e[m" } function echo.BoldULCyan() { - echo -e "\e[4;1;36m$1\e[m" + echo -e "\e[4;1;36m$@\e[m" } function echo.LightCyan() { - echo -e "\e[96m$1\e[m" + echo -e "\e[96m$@\e[m" } function echo.LightULCyan() { - echo -e "\e[4;96m$1\e[m" + echo -e "\e[4;96m$@\e[m" } function echo.LightBoldCyan() { - echo -e "\e[1;96m$1\e[m" + echo -e "\e[1;96m$@\e[m" } function echo.LightBoldULCyan() { - echo -e "\e[4;1;96m$1\e[m" + echo -e "\e[4;1;96m$@\e[m" } diff --git a/gen.sh b/gen.sh index c045447..cbcd02c 100755 --- a/gen.sh +++ b/gen.sh @@ -30,7 +30,7 @@ do ulCode='4;' fi echo "{" >> $dist - echo ' echo -e "\e['"$ulCode$bCode$code"$(grep $color table.txt | awk '{print $2}')'m$1\e[m"' >> $dist + echo ' echo -e "\e['"$ulCode$bCode$code"$(grep $color table.txt | awk '{print $2}')'m$@\e[m"' >> $dist echo "}" >> $dist done done