check_format.sh: fix up prints for shellcheck

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: I55f04e2b4ad481ebc7a7f565ed7a7a10c4156f93
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/10549
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Monica Kenguva <monica.kenguva@intel.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
This commit is contained in:
Jim Harris 2021-12-03 23:39:41 +00:00
parent 7b284f6201
commit 8dbf28ace9

View File

@ -481,7 +481,7 @@ function check_bash_static_analysis() {
local rc=0 local rc=0
if hash shellcheck 2> /dev/null; then if hash shellcheck 2> /dev/null; then
echo -n "Checking Bash style..." echo -n "Checking Bash static analysis with shellcheck..."
shellcheck_v=$(shellcheck --version | grep -P "version: [0-9\.]+" | cut -d " " -f2) shellcheck_v=$(shellcheck --version | grep -P "version: [0-9\.]+" | cut -d " " -f2)
@ -534,7 +534,7 @@ SC2119,SC2120,SC2128,SC2148,SC2153,SC2154,SC2164,SC2174,SC2178,SC2001,SC2206,SC2
get_bash_files | xargs -P$(nproc) -n1 shellcheck $SHCH_ARGS &> shellcheck.log get_bash_files | xargs -P$(nproc) -n1 shellcheck $SHCH_ARGS &> shellcheck.log
if [[ -s shellcheck.log ]]; then if [[ -s shellcheck.log ]]; then
echo " Bash formatting errors detected!" echo " Bash shellcheck errors detected!"
cat shellcheck.log cat shellcheck.log
if $SHCK_APPLY; then if $SHCK_APPLY; then
@ -548,7 +548,7 @@ SC2119,SC2120,SC2128,SC2148,SC2153,SC2154,SC2164,SC2174,SC2178,SC2001,SC2206,SC2
fi fi
rm -f shellcheck.log rm -f shellcheck.log
else else
echo "You do not have shellcheck installed so your Bash style is not being checked!" echo "You do not have shellcheck installed so your Bash static analysis is not being performed!"
fi fi
return $rc return $rc