From 6273fc478b9c95c4ae8d42c9021f9428b1d43811 Mon Sep 17 00:00:00 2001 From: David Spickett Date: Thu, 23 Apr 2020 11:10:08 +0100 Subject: Shellcheck fixes round 3 Now using the version that's present in the bionic images. Meaning we have more warnings but can also set the minimum level to ignore a lot of them. Fix the check for whether shellcheck supports --severity. (we have pipefail on, but we expect shellcheck to fail in this case) Change-Id: I296b8554591b7d327c75393e3924184abc6512b7 --- tcwg-upstream2gerrit.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tcwg-upstream2gerrit.sh') diff --git a/tcwg-upstream2gerrit.sh b/tcwg-upstream2gerrit.sh index c446b207..03c5b893 100755 --- a/tcwg-upstream2gerrit.sh +++ b/tcwg-upstream2gerrit.sh @@ -2,6 +2,7 @@ set -ef -o pipefail +# shellcheck source=jenkins-helpers.sh . "$(dirname $0)"/jenkins-helpers.sh convert_args_to_variables "$@" @@ -124,7 +125,7 @@ if $filter; then wanted2=0 # Search the same strings with '_' prefix or suffix, excluding string with 'parm' egrep '^[-+]' /tmp/mydiff.$$ | egrep -i '_arm|arm_|_thumb|thumb_|_aarch64|aarch64_' | grep -v -i 'parm' || wanted2=$? - if [ $wanted1 -eq 0 -o $wanted2 -eq 0 ] + if [ $wanted1 -eq 0 ] || [ $wanted2 -eq 0 ] then keepit=true else -- cgit v1.2.3