Skip to content

Commit 57b4efa

Browse files
committed
[update] : Use an external script in the help display
1 parent 423a2ae commit 57b4efa

File tree

1 file changed

+13
-10
lines changed

1 file changed

+13
-10
lines changed

allarch.sh

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,12 @@ getclm() {
104104
echo "$(cat -)" | cut -d " " -f "${1}"
105105
}
106106

107+
# Usage: echo_blank <number>
108+
# 指定されたぶんの半角空白文字を出力します
109+
echo_blank(){
110+
local _blank
111+
for _local in $(seq 1 "${1}"); do echo -ne " "; done
112+
}
107113

108114
_usage () {
109115
echo "usage ${0} [options] [channel]"
@@ -126,7 +132,7 @@ _usage () {
126132
echo " -l | --lang <lang> Specifies the default language for the live environment"
127133
echo " Default: ${locale_name}"
128134
echo " -k | --kernel <kernel> Set special kernel type.See below for available kernels"
129-
echo " Default: ${kernel}"
135+
echo " Default: ${defaultkernel}"
130136
echo " -o | --out <out_dir> Set the output directory"
131137
echo " Default: ${out_dir}"
132138
echo " -p | --password <password> Set a live user password"
@@ -139,26 +145,23 @@ _usage () {
139145
echo " Default: ${work_dir}"
140146
echo
141147

142-
local blank="33" _arch _lang _list _locale_name_list kernel _dirname _channel _b
148+
local blank="33" _arch _list _dirname _channel
143149

144150
echo " Language for each architecture:"
145151
for _list in ${script_path}/system/locale-* ; do
146152
_arch="${_list#${script_path}/system/locale-}"
147153
echo -n " ${_arch}"
148-
for i in $( seq 1 $(( ${blank} - 4 - ${#_arch} )) ); do echo -ne " "; done
149-
_locale_name_list=$(cat ${_list} | grep -h -v ^'#' | getclm 1)
150-
for _lang in ${_locale_name_list[@]};do echo -n "${_lang} "; done
151-
echo
154+
echo_blank "$(( ${blank} - 4 - ${#_arch} ))"
155+
"${script_path}/tools/locale.sh" -a "${_arch}" show
152156
done
153157

154158
echo
155159
echo " Kernel for each architecture:"
156160
for _list in ${script_path}/system/kernel-* ; do
157161
_arch="${_list#${script_path}/system/kernel-}"
158162
echo -n " ${_arch} "
159-
for i in $( seq 1 $(( ${blank} - 5 - ${#_arch} )) ); do echo -ne " "; done
160-
for kernel in $(grep -h -v ^'#' ${_list} | getclm 1); do echo -n "${kernel} "; done
161-
echo
163+
echo_blank "$(( ${blank} - 5 - ${#_arch} ))"
164+
"${script_path}/tools/kernel.sh" -a "${_arch}" show
162165
done
163166

164167
echo
@@ -170,7 +173,7 @@ _usage () {
170173
_channel="${_dirname}"
171174
fi
172175
echo -ne " ${_channel}"
173-
for _b in $( seq 1 $(( ${blank} - 4 - ${#_channel} )) ); do echo -ne " "; done
176+
echo_blank "$(( ${blank} - 4 - ${#_channel} ))"
174177
if [[ ! "$(cat "${script_path}/channels/${_dirname}/alteriso" 2> /dev/null)" = "alteriso=${alteriso_version}" ]] && [[ "${nochkver}" = false ]]; then
175178
"${script_path}/tools/msg.sh" --noadjust -l 'ERROR:' --noappname error "Not compatible with AlterISO3"
176179
elif [[ -f "${script_path}/channels/${_dirname}/description.txt" ]]; then

0 commit comments

Comments
 (0)