Skip to content

Commit af04a9d

Browse files
committed
[fix] : Fixed SC2046
1 parent 2983e9f commit af04a9d

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

build.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ show_channel_list() {
269269
# for_module <command>
270270
for_module(){
271271
local module
272-
for module in "${modules[@]}"; do eval $(echo "${@}" | sed "s|{}|${module}|g"); done
272+
for module in "${modules[@]}"; do eval "$(echo "${@}" | sed "s|{}|${module}|g")"; done
273273
}
274274

275275
# パッケージをインストールする
@@ -471,8 +471,8 @@ prepare_build() {
471471
fi
472472

473473
# Parse files
474-
eval $(bash "${tools_dir}/locale.sh" -s -a "${arch}" get "${locale_name}")
475-
eval $(bash "${tools_dir}/kernel.sh" -s -c "${channel_name}" -a "${arch}" get "${kernel}")
474+
eval "$(bash "${tools_dir}/locale.sh" -s -a "${arch}" get "${locale_name}")"
475+
eval "$(bash "${tools_dir}/kernel.sh" -s -c "${channel_name}" -a "${arch}" get "${kernel}")"
476476

477477
# Set username
478478
if [[ "${customized_username}" = false ]]; then
@@ -1076,10 +1076,10 @@ make_iso() {
10761076

10771077

10781078
# Parse options
1079-
ARGUMENT="${@}"
1079+
ARGUMENT=("${@}")
10801080
OPTS="a:bc:deg:hjk:l:o:p:rt:u:w:x"
10811081
OPTL="arch:,boot-splash,comp-type:,debug,cleaning,cleanup,gpgkey:,help,lang:,japanese,kernel:,out:,password:,comp-opts:,user:,work:,bash-debug,nocolor,noconfirm,nodepend,gitversion,msgdebug,noloopmod,tarball,noiso,noaur,nochkver,channellist,config:,noefi,nodebug,nosigcheck,normwork,log,logpath:,nolog,nopkgbuild"
1082-
if ! OPT=$(getopt -o ${OPTS} -l ${OPTL} -- ${DEFAULT_ARGUMENT} ${ARGUMENT}); then
1082+
if ! OPT=$(getopt -o ${OPTS} -l ${OPTL} -- ${DEFAULT_ARGUMENT} "${ARGUMENT[@]}"); then
10831083
exit 1
10841084
fi
10851085

@@ -1264,8 +1264,8 @@ done
12641264
# Check root.
12651265
if (( ! "${EUID}" == 0 )); then
12661266
msg_warn "This script must be run as root." >&2
1267-
msg_warn "Re-run 'sudo ${0} ${DEFAULT_ARGUMENT} ${ARGUMENT}'"
1268-
sudo ${0} ${DEFAULT_ARGUMENT} ${ARGUMENT}
1267+
msg_warn "Re-run 'sudo ${0} ${DEFAULT_ARGUMENT} ${ARGUMENT[*]}'"
1268+
sudo ${0} ${DEFAULT_ARGUMENT} "${ARGUMENT[@]}"
12691269
exit "${?}"
12701270
fi
12711271

0 commit comments

Comments
 (0)