From 84bca7e4d0d4b09f33dcbba784e887c92588f25d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beat=20K=C3=BCng?= Date: Tue, 9 Jul 2019 18:45:18 +0200 Subject: [PATCH] shellcheck: disable SC2181 The combination of 'if mycmd' and a logical expression is not supported in NuttX. --- ROMFS/CMakeLists.txt | 1 + Tools/run-shellcheck.sh | 2 ++ 2 files changed, 3 insertions(+) diff --git a/ROMFS/CMakeLists.txt b/ROMFS/CMakeLists.txt index 0709608ac2..259c017d8f 100644 --- a/ROMFS/CMakeLists.txt +++ b/ROMFS/CMakeLists.txt @@ -260,6 +260,7 @@ if(SHELLCHECK_PATH) --exclude=SC2166 # SC2166: Prefer [ p ] || [ q ] as [ p -o q ] is not well defined. --exclude=SC2154 # SC2154: is referenced but not assigned (NuttX uses different asssignment) --exclude=SC2164 # SC2164: Use 'cd ... || exit' or 'cd ... || return' in case cd fails. + --exclude=SC2181 # SC2181: Check exit code directly with e.g. 'if mycmd;', not indirectly with $?. `find ${romfs_gen_root_dir}/init.d -type f` DEPENDS ${romfs_gen_root_dir}/init.d/rc.autostart WORKING_DIRECTORY ${romfs_gen_root_dir} diff --git a/Tools/run-shellcheck.sh b/Tools/run-shellcheck.sh index 3354bbc30c..cf58ae0f97 100755 --- a/Tools/run-shellcheck.sh +++ b/Tools/run-shellcheck.sh @@ -25,6 +25,7 @@ echo "Running shellcheck in '$search_directory'." # SC2166: allow the form [ $OUTPUT_MODE == fmu -o $OUTPUT_MODE == io ] # SC2148: allow files w/o shebang # SC2039: In POSIX sh, array references are undefined. TODO: fix this +# SC2181: Check exit code directly with e.g. 'if mycmd;', not indirectly with $?. shellcheck -x \ -e SC1008 \ -e SC2086 \ @@ -32,6 +33,7 @@ shellcheck -x \ -e SC2148 \ -e SC2166 \ -e SC2039 \ + -e SC2181 \ --shell=dash \ $scripts ret=$?