summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2023-10-07 05:36:52 +0100
committerLeah Rowe <leah@libreboot.org>2023-10-07 05:37:11 +0100
commit4708da2ca9a72520f39749b3b34b0bdc2fbfa15d (patch)
tree8c7f436fc53d10665f150e295d2d488b3f86e729
parent0fad3497b82d9225468835d1b27717050ca6de46 (diff)
use quotes when checking empty strings in scripts
this is far less error-prone Signed-off-by: Leah Rowe <leah@libreboot.org>
-rwxr-xr-xinclude/option.sh4
-rwxr-xr-xscript/build/fw/coreboot14
-rwxr-xr-xscript/update/project/build14
-rwxr-xr-xscript/update/project/trees4
-rwxr-xr-xscript/update/release/src2
-rwxr-xr-xscript/update/vendor/inject6
6 files changed, 22 insertions, 22 deletions
diff --git a/include/option.sh b/include/option.sh
index 6ae5f2de..bc5bb42a 100755
--- a/include/option.sh
+++ b/include/option.sh
@@ -41,11 +41,11 @@ handle_coreboot_utils()
{
for util in cbfstool ifdtool; do
x_ ./update project build ${_f} "src/coreboot/${1}/util/${util}"
- [ -z ${mode} ] && [ ! -f "cbutils/${1}/${util}" ] && \
+ [ -z "${mode}" ] && [ ! -f "cbutils/${1}/${util}" ] && \
x_ mkdir -p "cbutils/${1}" && \
x_ cp "src/coreboot/${1}/util/${util}/${util}" \
"cbutils/${1}"
- [ -z ${mode} ] || \
+ [ -z "${mode}" ] || \
x_ rm -Rf "cbutils/${1}"
done
}
diff --git a/script/build/fw/coreboot b/script/build/fw/coreboot
index d0357c59..dede12c8 100755
--- a/script/build/fw/coreboot
+++ b/script/build/fw/coreboot
@@ -72,15 +72,15 @@ check_target()
# Override the above defaults using target.cfg
. "${targetdir}/target.cfg"
- [ -z ${grub_scan_disk} ] && \
+ [ -z "${grub_scan_disk}" ] && \
grub_scan_disk="both"
[ "${grub_scan_disk}" != "both" ] && [ "${grub_scan_disk}" != "ata" ] \
&& [ "${grub_scan_disk}" != "ahci" ] && \
grub_scan_disk="both"
- [ -z ${tree} ] && \
+ [ -z "${tree}" ] && \
err "Target '${board}' defines no tree. Skipping build."
- [ -z ${arch} ] && \
+ [ -z "${arch}" ] && \
err "Target '${board}' defines no arch. Skipping build."
[ "${payload_memtest}" != "y" ] && \
@@ -104,13 +104,13 @@ check_target()
[ "${payload_uboot}" != "n" ] && [ "${payload_uboot}" != "y" ] && \
payload_uboot="n"
- [ "${payload_uboot}" = "y" ] && [ -z ${uboot_config} ] && \
+ [ "${payload_uboot}" = "y" ] && [ -z "${uboot_config}" ] && \
uboot_config="default"
[ "${vendorfiles}" != "n" ] && [ "${vendorfiles}" != "y" ] && \
vendorfiles="y"
# Override all payload directives with cmdline args
- [ -z ${_payload} ] && return 0
+ [ -z "${_payload}" ] && return 0
printf "setting payload to: %s\n" "${_payload}"
eval "$(setvars "n" payload_grub payload_memtest payload_seabios \
payload_seabios_withgrub payload_uboot payload_grub_withseabios)"
@@ -192,7 +192,7 @@ build_target()
hmode="vesafb"
[ "${initmode}" = "vgarom" ] || hmode="corebootfb"
modes="${hmode} txtmode"
- [ -z ${_displaymode} ] || modes="${_displaymode}"
+ [ -z "${_displaymode}" ] || modes="${_displaymode}"
for y in ${modes}; do
displaymode="${y}"
[ "${initmode}" = "normal" ] && \
@@ -289,7 +289,7 @@ build_grub_roms()
for kmapfile in "${kmapdir}"/*; do
keymaps="${keymaps} ${kmapfile}"
done
- [ -z ${_keyboard} ] || keymaps="${kmapdir}/${_keyboard}.gkb"
+ [ -z "${_keyboard}" ] || keymaps="${kmapdir}/${_keyboard}.gkb"
for keymapfile in ${keymaps}; do
[ -f "${keymapfile}" ] || continue
diff --git a/script/update/project/build b/script/update/project/build
index 57e95953..2d457485 100755
--- a/script/update/project/build
+++ b/script/update/project/build
@@ -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}
diff --git a/script/update/project/trees b/script/update/project/trees
index 4b25d5b9..f38101c6 100755
--- a/script/update/project/trees
+++ b/script/update/project/trees
@@ -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
}
diff --git a/script/update/release/src b/script/update/release/src
index f8909bbf..b63994b5 100755
--- a/script/update/release/src
+++ b/script/update/release/src
@@ -105,7 +105,7 @@ create_release_archive()
fail()
{
- [ -z ${srcdir} ] || rm -Rf "${srcdir}" 1>/dev/null 2>/dev/null || :
+ [ -z "${srcdir}" ] || rm -Rf "${srcdir}" 1>/dev/null 2>/dev/null || :
fail "${1}"
}
diff --git a/script/update/vendor/inject b/script/update/vendor/inject
index 0b26f81e..846f1846 100755
--- a/script/update/vendor/inject
+++ b/script/update/vendor/inject
@@ -41,7 +41,7 @@ check_board()
if ! check_release "${archive}" ; then
[ -f "${rom}" ] || \
err "check_board: \"${rom}\" is not a valid path"
- [ -z ${rom+x} ] && \
+ [ -z "${rom+x}" ] && \
err "check_board: no rom specified"
[ ! -z ${board+x} ] || \
board=$(detect_board "${rom}")
@@ -214,7 +214,7 @@ inject_vendorfile_intel_me()
printf "adding intel me firmware\n"
rom="${1}"
- [ -z ${CONFIG_ME_BIN_PATH} ] && \
+ [ -z "${CONFIG_ME_BIN_PATH}" ] && \
err "inject_vendorfile_intel_me: CONFIG_ME_BIN_PATH not set"
_me_location=${CONFIG_ME_BIN_PATH##*../}
@@ -282,7 +282,7 @@ inject_vendorfile_smsc_sch5545_ec()
modify_gbe()
{
printf "changing mac address in gbe to ${new_mac}\n"
- [ -z ${CONFIG_GBE_BIN_PATH} ] && \
+ [ -z "${CONFIG_GBE_BIN_PATH}" ] && \
err "modify_gbe: ${board}: CONFIG_GBE_BIN_PATH not set"
rom="${1}"