From: hayao <shun819.mail@gmail.com>
Date: Tue, 10 Nov 2020 10:15:16 +0000 (+0900)
Subject: [update] : Get the channel description using channel.sh
X-Git-Tag: rc3-alpha1~15
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=dbdf44a96ee7666312a5e44dec8287d3702b1bfe;p=alterlinux%2Falterlinux.git

[update] : Get the channel description using channel.sh
---

diff --git a/allarch.sh b/allarch.sh
index 1d50c08b..d0fb2b49 100755
--- a/allarch.sh
+++ b/allarch.sh
@@ -174,13 +174,7 @@ _usage () {
         fi
         echo -ne "    ${_channel}"
         echo_blank "$(( ${blank} - 4 - ${#_channel} ))"
-        if [[ ! "$(cat "${script_path}/channels/${_dirname}/alteriso" 2> /dev/null)" = "alteriso=${alteriso_version}" ]] && [[ "${nochkver}" = false ]]; then
-            "${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
-            "${script_path}/tools/msg.sh" --noadjust -l 'WARN :' --noappname warn "This channel does not have a description.txt"
-        fi
+        "${script_path}/tools/channel.sh" desc "${_channel}"
     done
 
     echo