From cab83c51a8b595901c4d4e5f05dae6ad133a4932 Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Thu, 21 Jun 2018 12:16:39 +1000 Subject: [PATCH] Fix SC2222 warnings --- scripts/update-indent.sh | 2 +- tests/code_layout/test_shellcheck.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/update-indent.sh b/scripts/update-indent.sh index ad9c583e0c2..8b413e8eb8b 100644 --- a/scripts/update-indent.sh +++ b/scripts/update-indent.sh @@ -62,7 +62,7 @@ for f in $MODIFIED; do continue ;; - *.cpp|*.h|*.c|*.h|*.cxx|*.hxx|*.c++|*.h++|*.cc|*.hh|*.C|*.H|*.hpp) + *.cpp|*.h|*.c|*.cxx|*.hxx|*.c++|*.h++|*.cc|*.hh|*.C|*.H|*.hpp) cmd=astyle.sh ;; diff --git a/tests/code_layout/test_shellcheck.sh b/tests/code_layout/test_shellcheck.sh index d654245d017..70e82b70d01 100755 --- a/tests/code_layout/test_shellcheck.sh +++ b/tests/code_layout/test_shellcheck.sh @@ -5,7 +5,7 @@ DIR=$(git rev-parse --show-toplevel) pushd ${DIR} > /dev/null || exit -result=$(shellcheck -e SC2016,SC2015,SC2086,SC2002,SC1117,SC2154,SC2076,SC2046,SC1090,SC2038,SC2031,SC2030,SC2162,SC2196,SC2034,SC2044,SC2119,SC1001,SC2188,SC2119,SC2188,SC2120,SC2103,SC2059,SC2006,SC2221,SC2222,SC2120,SC2128,SC2005,SC2013,SC2027,SC2090,SC2089,SC2124,SC2001,SC2010,SC1072,SC1073,SC1009,SC2166,SC2045,SC2028,SC1091,SC1083 $(find . -name '*.sh')) +result=$(shellcheck -e SC2016,SC2015,SC2086,SC2002,SC1117,SC2154,SC2076,SC2046,SC1090,SC2038,SC2031,SC2030,SC2162,SC2196,SC2034,SC2044,SC2119,SC1001,SC2188,SC2119,SC2188,SC2120,SC2103,SC2059,SC2006,SC2221,SC2128,SC2005,SC2013,SC2027,SC2090,SC2089,SC2124,SC2001,SC2010,SC1072,SC1073,SC1009,SC2166,SC2045,SC2028,SC1091,SC1083 $(find . -name '*.sh')) popd > /dev/null || exit if [[ $result ]]; then