Skip to content

Commit e7511f9

Browse files
committed
[fix] : Fixed shellcheck warnings
1 parent 6be6455 commit e7511f9

File tree

3 files changed

+14
-16
lines changed

3 files changed

+14
-16
lines changed

tools/docker-build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ EOF
1414
exit 1
1515
fi
1616

17-
script_path="$(cd -P $(dirname $(readlink -f ${0})) && cd .. && pwd)"
17+
script_path="$( cd -P "$( dirname "$(readlink -f "$0")" )" && cd .. && pwd )"
1818

1919
_usage () {
2020
echo "usage ${0} [options]"

tools/fullbuild.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ unset OPT OPTS OPTL ARGUMENT
156156
while true; do
157157
case "${1}" in
158158
-a)
159-
share_options+=(${2})
159+
IFS=" " read -r -a share_options <<< "${2}"
160160
shift 2
161161
;;
162162
-c)
@@ -172,7 +172,7 @@ while true; do
172172
shift 1
173173
;;
174174
-m)
175-
architectures=(${2})
175+
IFS=" " read -r -a architectures <<< "${2}"
176176
shift 2
177177
;;
178178
-o)
@@ -200,7 +200,7 @@ while true; do
200200
share_options+=("--tarball")
201201
;;
202202
-l)
203-
locale_list=(${2})
203+
IFS=" " read -r -a locale_list <<< "${2}"
204204
shift 2
205205
;;
206206
-w)
@@ -238,7 +238,7 @@ if [[ "${all_channel}" = true ]]; then
238238
if [[ -n "${*}" ]]; then
239239
msg_error "Do not specify the channel." "1"
240240
else
241-
channels=($("${script_path}/tools/channel.sh" -b show))
241+
readarray -t channels < <("${script_path}/tools/channel.sh" -b show)
242242
fi
243243
elif [[ -n "${*}" ]]; then
244244
channels=("${@}")
@@ -267,7 +267,7 @@ mkdir -p "${fullbuild_dir}"
267267

268268
if [[ "$(find "${fullbuild_dir}" -maxdepth 1 -mindepth 1 -name "fullbuild.*" 2> /dev/null)" ]]; then
269269
msg_info "Do you want to reset lock files ? (y/N)"
270-
read -n 1 _yes_or_no
270+
read -r -n 1 _yes_or_no
271271
echo
272272
if [[ "${_yes_or_no}" = "y" ]] || [[ "${_yes_or_no}" = "Y" ]]; then
273273
find "${fullbuild_dir}" -maxdepth 1 -mindepth 1 -name "fullbuild.*" -delete 2> /dev/null
@@ -279,7 +279,7 @@ share_options+=("--work" "${work_dir}")
279279
msg_info "Options: ${share_options[*]}"
280280
if [[ "${noconfirm}" = false ]]; then
281281
msg_info "Press Enter to continue or Ctrl + C to cancel."
282-
read
282+
read -r
283283
fi
284284

285285

@@ -289,7 +289,7 @@ for arch in "${architectures[@]}"; do
289289
for cha in "${channels[@]}"; do
290290
for lang in "${locale_list[@]}"; do
291291
for retry_count in $(seq 1 "${retry}"); do
292-
if [[ -n "$(cat "${script_path}/channels/${cha}/architecture" | grep -h -v ^'#' | grep -x "${arch}")" ]]; then
292+
if grep -h -v ^'#' "${script_path}/channels/${cha}/architecture" | grep -x "${arch}" 1> /dev/null 2>&1; then
293293
build
294294
fi
295295
done

tools/kernel.sh

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,12 @@ _help() {
2828
echo
2929
echo " Script mode usage:"
3030
echo " check Returns 0 if the check was successful, 1 otherwise."
31-
printf ' get eval $(%s -s -a <arch> -c <channel> get <kernel>)\n' "$(basename ${0})"
31+
printf ' get eval $(%s -s -a <arch> -c <channel> get <kernel>)\n' "$(basename "${0}")"
3232
}
3333

3434
# Usage: getclm <number>
3535
# 標準入力から値を受けとり、引数で指定された列を抽出します。
36-
getclm() {
37-
echo "$(cat -)" | cut -d " " -f "${1}"
38-
}
36+
getclm() { cut -d " " -f "${1}"; }
3937

4038
# Message functions
4139
msg_error() {
@@ -55,7 +53,7 @@ gen_kernel_list() {
5553
else
5654
_list="${script_path}/system/kernel-${arch}"
5755
fi
58-
for _kernel in $(grep -h -v ^'#' ${_list} | getclm 1); do
56+
for _kernel in $(grep -h -v ^'#' "${_list}" | getclm 1); do
5957
kernellist+=("${_kernel}")
6058
done
6159
}
@@ -98,12 +96,12 @@ get() {
9896
else
9997
_kernel_config_file="${script_path}/system/kernel-${arch}"
10098
fi
101-
_kernel_name_list=($(cat "${_kernel_config_file}" | grep -h -v ^'#' | getclm 1))
99+
readarray -t _kernel_name_list < <(grep -h -v ^'#' "${_kernel_config_file}" | getclm 1)
102100
_get_kernel_line() {
103101
local _kernel _count=0
104102
for _kernel in "${_kernel_name_list[@]}"; do
105103
_count=$(( _count + 1 ))
106-
if [[ "${_kernel}" = "${1}" ]]; then echo "${_count}"; return 0; fi
104+
[[ "${_kernel}" = "${1}" ]] && echo "${_count}"
107105
done
108106
echo -n "failed"
109107
return 0
@@ -120,7 +118,7 @@ get() {
120118
fi
121119

122120
# カーネル設定ファイルから該当の行を抽出
123-
_kernel_config_line=($(cat "${_kernel_config_file}" | grep -h -v ^'#' | grep -v ^$ | head -n "${_kernel_line}" | tail -n 1))
121+
readarray -t _kernel_config_line < <(grep -h -v ^'#' "${_kernel_config_file}" | grep -v ^$ | head -n "${_kernel_line}" | tail -n 1)
124122

125123
# 抽出された行に書かれた設定をそれぞれの変数に代入
126124
# ここで定義された変数のみがグローバル変数

0 commit comments

Comments
 (0)