diff --git a/lib/lib-common.sh b/lib/lib-common.sh index cabf74e..2abff88 100644 --- a/lib/lib-common.sh +++ b/lib/lib-common.sh @@ -5,13 +5,13 @@ # ============================================================================ # 颜色输出函数 # ============================================================================ -red() { echo -e "\033[31m\033[01m$1\033[0m"; } -green() { echo -e "\033[32m\033[01m$1\033[0m"; } -yellow() { echo -e "\033[33m\033[01m$1\033[0m"; } -blue() { echo -e "\033[34m\033[01m$1\033[0m"; } -light_magenta() { echo -e "\033[95m\033[01m$1\033[0m"; } -light_yellow() { echo -e "\033[93m\033[01m$1\033[0m"; } -cyan() { echo -e "\033[38;2;0;255;255m$1\033[0m"; } +red() { printf "\033[31m\033[01m%s\033[0m\n" "$1"; } +green() { printf "\033[32m\033[01m%s\033[0m\n" "$1"; } +yellow() { printf "\033[33m\033[01m%s\033[0m\n" "$1"; } +blue() { printf "\033[34m\033[01m%s\033[0m\n" "$1"; } +light_magenta() { printf "\033[95m\033[01m%s\033[0m\n" "$1"; } +light_yellow() { printf "\033[93m\033[01m%s\033[0m\n" "$1"; } +cyan() { printf "\033[38;2;0;255;255m%s\033[0m\n" "$1"; } # ============================================================================ # 全局变量 diff --git a/main.sh b/main.sh index 67a33dc..b8b137a 100755 --- a/main.sh +++ b/main.sh @@ -3,13 +3,13 @@ # by @wukongdaily # 定义颜色输出函数 -red() { echo -e "\033[31m\033[01m$1\033[0m"; } -green() { echo -e "\033[32m\033[01m$1\033[0m"; } -yellow() { echo -e "\033[33m\033[01m$1\033[0m"; } -blue() { echo -e "\033[34m\033[01m$1\033[0m"; } -light_magenta() { echo -e "\033[95m\033[01m$1\033[0m"; } -light_yellow() { echo -e "\033[93m\033[01m$1\033[0m"; } -cyan() { echo -e "\033[38;2;0;255;255m$1\033[0m"; } +red() { printf "\033[31m\033[01m%s\033[0m\n" "$1"; } +green() { printf "\033[32m\033[01m%s\033[0m\n" "$1"; } +yellow() { printf "\033[33m\033[01m%s\033[0m\n" "$1"; } +blue() { printf "\033[34m\033[01m%s\033[0m\n" "$1"; } +light_magenta() { printf "\033[95m\033[01m%s\033[0m\n" "$1"; } +light_yellow() { printf "\033[93m\033[01m%s\033[0m\n" "$1"; } +cyan() { printf "\033[38;2;0;255;255m%s\033[0m\n" "$1"; } HTTP_HOST="https://cafe.cpolar.cn/wkdaily/gl/raw/branch/main" SCRIPT_DIR="/tmp/gl-scripts"