Skip to content

Commit 84cac9c

Browse files
committed
Merge branch 'alteriso-3.1-plasma' of https://github.com/FascodeNet/alterlinux into alteriso-3.1-plasma
2 parents 6321265 + 6e5e60d commit 84cac9c

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ show_channel_list() {
227227
# for_module <command>
228228
for_module(){
229229
local module
230-
for module in "${modules[@]}"; do eval "$(echo "${@}" | sed "s|{}|${module}|g")"; done
230+
for module in "${modules[@]}"; do eval "${@//"{}"/${module}}"; done
231231
}
232232

233233
# pacstrapを実行
@@ -301,8 +301,8 @@ check_bool() {
301301
local _value _variable
302302
for _variable in "${@}"; do
303303
msg_debug -n "Checking ${_variable}..."
304-
eval ': ${'${_variable}':=""}'
305-
_value="$(eval echo '$'${_variable})"
304+
eval ": \${${_variable}:=''}"
305+
_value="$(eval echo "\$${_variable}")"
306306
if [[ ! -v "${1}" ]] || [[ "${_value}" = "" ]]; then
307307
[[ "${debug}" = true ]] && echo ; msg_error "The variable name ${_variable} is empty." "1"
308308
elif [[ ! "${_value}" = "true" ]] && [[ ! "${_value}" = "false" ]]; then

0 commit comments

Comments
 (0)