summaryrefslogtreecommitdiffstats
path: root/scripts/check-config.sh
diff options
context:
space:
mode:
authorLuca Ceresoli <luca@lucaceresoli.net>2018-03-15 11:08:56 +0100
committerTom Rini <trini@konsulko.com>2018-03-22 16:32:30 -0400
commitf69dce5081396a83b87d6df2693764b99466a18d (patch)
tree55bf32a02d17e0ccd8224787af0416df2b48be59 /scripts/check-config.sh
parentdc73483a122960d094486fc58df953209bdb1edd (diff)
downloadu-boot-f69dce5081396a83b87d6df2693764b99466a18d.tar.gz
u-boot-f69dce5081396a83b87d6df2693764b99466a18d.tar.xz
u-boot-f69dce5081396a83b87d6df2693764b99466a18d.zip
scripts/check-config.sh: fix "command not found" error handling
scripts/check-config.sh exits successfully and silently without doing any checks when the 'comm' command is not found. The problem triggers from the command around line 39: comm -23 ${suspects} ${ok} >${new_adhoc} This statement fails when 'comm' is not in $PATH, creating an empty ${new_adhoc} file. But the script continues and the following line, which is supposed to detect an error: if [ -s ${new_adhoc} ]; then will always be false since the file is empty, and the script will exit successfully as if everything were OK. The case where 'comm' in not in $PATH is not theoretical. It used to happen on yocto until a recent fix [0], and still happens on the current stable branch (rocko). Fix by setting the errexit flag to exit with error when a statement fails, so that at least the problem is noticed. For additional safety also set the nounset flag to detect expansion errors. [0] http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=fe0b4cb5b48580d4a3f3c0eb82bfa6f1b13801e4 Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net> Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'scripts/check-config.sh')
-rwxr-xr-xscripts/check-config.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/check-config.sh b/scripts/check-config.sh
index 267758498b..4848ca6e25 100755
--- a/scripts/check-config.sh
+++ b/scripts/check-config.sh
@@ -14,6 +14,9 @@
# For example:
# scripts/check-config.sh b/chromebook_link/u-boot.cfg kconfig_whitelist.txt .
+set -e
+set -u
+
path="$1"
whitelist="$2"
srctree="$3"