use quotes when checking empty strings in scripts

this is far less error-prone

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2023-10-07 05:36:52 +01:00
parent 0fad3497b8
commit 4708da2ca9
6 changed files with 22 additions and 22 deletions
+7 -7
View File
@@ -33,8 +33,8 @@ main()
esac
shift; project="${OPTARG#src/}"; shift
done
[ -z ${_f} ] && err "flag not specified (-m, -u, -b, -c or -x)"
[ -z ${project} ] && err "project name not specified"
[ -z "${_f}" ] && err "flag not specified (-m, -u, -b, -c or -x)"
[ -z "${project}" ] && err "project name not specified"
if [ ! -f "config/${project}/build.list" ]; then
build_projects $@
@@ -80,7 +80,7 @@ build_targets()
err "Cannot get options for ${cfgsdir}"
[ $# -gt 0 ] && targets=$@
[ -z ${mode} ] && x_ mkdir -p "${elfdir}/"
[ -z "${mode}" ] && x_ mkdir -p "${elfdir}/"
handle_targets
}
@@ -97,7 +97,7 @@ handle_targets()
done
[ "${target1}" = "utils" ] && [ "${project}" = "coreboot" ] && return 0
[ -z ${mode} ] || return 0
[ -z "${mode}" ] || return 0
printf "Done! The files are stored under %s/\n\n" "${elfdir}"
}
@@ -138,9 +138,9 @@ handle_src_tree()
# Override the above defaults using target.cfg
. "${target_dir}/target.cfg" # source
[ -z ${tree} ] && \
[ -z "${tree}" ] && \
err "handle_src_tree: ${target_dir}: tree undefined"
[ -z ${arch} ] && \
[ -z "${arch}" ] && \
err "handle_src_tree: ${target_dir}: undefined cpu type"
codedir="src/${project}/${tree}"
@@ -260,7 +260,7 @@ run_make_command()
{
[ -f "${codedir}/Makefile" ] || [ -f "${codedir}/makefile" ] || \
[ -f "${codedir}/GNUmakefile" ] || return 1
[ "${project}" = "coreboot" ] && [ -z ${mode} ] && \
[ "${project}" = "coreboot" ] && [ -z "${mode}" ] && \
x_ printf "%s\n" "${version}" >"${codedir}/.coreboot-version"
x_ make -C "${codedir}" -j$(nproc) ${mode}
+2 -2
View File
@@ -66,8 +66,8 @@ fetch_config()
err "fetch_config: no \"${cfgsdir}/${_target}/target.cfg\""
[ "${_target}" != "${tree}" ] && _target="${tree}" && continue
[ -z ${tree} ] && err "${_xm}: tree undefined"
[ -z ${rev} ] && err "${_xm}: revision undefined"
[ -z "${tree}" ] && err "${_xm}: tree undefined"
[ -z "${rev}" ] && err "${_xm}: revision undefined"
break
done
}