From: hayao <shun819.mail@gmail.com>
Date: Sun, 4 Oct 2020 13:32:47 +0000 (+0900)
Subject: [update] : Use msg.sh instead of echo_color in help function
X-Git-Tag: rc3-alpha1~143
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=66ee3255c2a43202de9d36a89205102b30ca6507;p=alterlinux%2Falterlinux.git

[update] : Use msg.sh instead of echo_color in help function
---

diff --git a/allarch.sh b/allarch.sh
index 54c138ce..9bcaa79b 100755
--- a/allarch.sh
+++ b/allarch.sh
@@ -159,11 +159,11 @@ _usage () {
         echo -ne "    ${_channel}"
         for _b in $( seq 1 $(( ${blank} - 4 - ${#_channel} )) ); do echo -ne " "; done
         if [[ ! "$(cat "${script_path}/channels/${_dirname}/alteriso" 2> /dev/null)" = "alteriso=${alteriso_version}" ]] && [[ "${nochkver}" = false ]]; then
-            echo -ne "$( echo_color -t '31' 'ERROR:') Not compatible with AlterISO3\n"
+            "${script_path}/tools/msg.sh" --noadjust -l 'ERROR:' --noappname error "Not compatible with AlterISO3"
         elif [[ -f "${script_path}/channels/${_dirname}/description.txt" ]]; then
             echo -ne "$(cat "${script_path}/channels/${_dirname}/description.txt")\n"
         else
-            echo -ne "$( echo_color -t '33' 'WARN :') This channel does not have a description.txt.\n"
+            "${script_path}/tools/msg.sh" --noadjust -l 'WARN :' --noappname warn "This channel does not have a description.txt"
         fi
     done
 
diff --git a/build.sh b/build.sh
index 0a191d42..695be717 100755
--- a/build.sh
+++ b/build.sh
@@ -174,11 +174,11 @@ _usage () {
         echo -ne "    ${_channel}"
         for _b in $( seq 1 $(( ${blank} - 4 - ${#_channel} )) ); do echo -ne " "; done
         if [[ ! "$(cat "${script_path}/channels/${_dirname}/alteriso" 2> /dev/null)" = "alteriso=${alteriso_version}" ]] && [[ "${nochkver}" = false ]]; then
-            echo -ne "$( echo_color -t '31' 'ERROR:') Not compatible with AlterISO3\n"
+            "${script_path}/tools/msg.sh" --noadjust -l 'ERROR:' --noappname error "Not compatible with AlterISO3"
         elif [[ -f "${script_path}/channels/${_dirname}/description.txt" ]]; then
             echo -ne "$(cat "${script_path}/channels/${_dirname}/description.txt")\n"
         else
-            echo -ne "$( echo_color -t '33' 'WARN :') This channel does not have a description.txt.\n"
+            "${script_path}/tools/msg.sh" --noadjust -l 'WARN :' --noappname warn "This channel does not have a description.txt"
         fi
     done
     echo -ne "    rebuild"