diff options
| author | David Spickett <david.spickett@linaro.org> | 2020-04-23 11:10:08 +0100 |
|---|---|---|
| committer | David Spickett <david.spickett@linaro.org> | 2020-04-28 13:13:46 +0000 |
| commit | 6273fc478b9c95c4ae8d42c9021f9428b1d43811 (patch) | |
| tree | 9564b82cc9e90dc4886835d30cbdea35453b1f53 /tcwg-upstream2gerrit.sh | |
| parent | 0ce72e970e6cbb6c39469b503cdf65510f4f99d8 (diff) | |
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
Diffstat (limited to 'tcwg-upstream2gerrit.sh')
| -rwxr-xr-x | tcwg-upstream2gerrit.sh | 3 |
1 files changed, 2 insertions, 1 deletions
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 |