diff options
Diffstat (limited to 'include/option.sh')
| -rwxr-xr-x | include/option.sh | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/include/option.sh b/include/option.sh index ed094b5c..a764bc33 100755 --- a/include/option.sh +++ b/include/option.sh @@ -20,9 +20,10 @@ eval "$(setvars "" CONFIG_BOARD_DELL_E6400 CONFIG_HAVE_MRC CONFIG_HAVE_ME_BIN \ items() { rval=1 - [ ! -d "${1}" ] && \ - printf "items: directory '%s' doesn't exist" "${1}" && \ - return 1 + if [ ! -d "${1}" ]; then + printf "items: directory '%s' doesn't exist" "${1}" 1>&2 + return 1 + fi for x in "${1}/"*; do # -e used because this is for files *or* directories [ -e "${x}" ] || continue @@ -43,7 +44,10 @@ scan_config() "${_fail}" "scan_config ${confdir}: Cannot concatenate files" while read -r line ; do set ${line} 1>/dev/null 2>/dev/null || : - [ "${1%:}" = "depend" ] && depend="${depend} ${2}" && continue + if [ "${1%:}" = "depend" ]; then + depend="${depend} ${2}" + continue + fi eval "${1%:}=\"${2}\"" done << EOF $(eval "awk '${awkstr}' \"${revfile}\"") |