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

1 files changed, 7 insertions, 6 deletions

diff --git a/MakeRelease.job b/MakeRelease.job
index cd2a6bfc..017189a8 100755
--- a/MakeRelease.job
+++ b/MakeRelease.job
@@ -132,7 +132,7 @@ if [ x"$target" = x"aarch64-linux-gnu_ilp32" ]; then
 fi
 
 # Use the newly created build directory
-cd ${user_workspace}/_build
+cd ${user_workspace}/_build || exit
 
 if ! test -e host.conf; then
   $CONFIG_SHELL ${abe_dir}/configure --with-local-snapshots=${user_snapshots} \
@@ -156,7 +156,8 @@ logfile=${user_workspace}/MakeRelease-${buildnumber}-$(uname -m).log
 # Set ABE's --target setting.  No setting means native.
 # If manifest file is set, then ABE must use its setting.
 target_opt=
-if [ x"${target}" != x"native" -a x"${target}" != x -a x"$manifest" = x"" ]; then
+if [ x"${target}" != x"native" ] && [ x"${target}" != x ] && \
+   [ x"$manifest" = x"" ]; then
     target_opt="--target ${target}"
 fi
 
@@ -236,16 +237,16 @@ buildid=`printf '%04d' ${buildnumber}`
 binaries="$artifacts_top/binaries/${gcc_release}-${series_date}-${buildid}/${target}"
 logs="$artifacts_top/logs/${gcc_release}-${series_date}-${buildid}/${target}"
 
-if [ "x${binariesdir}" != "x" -a \
-     "x${binariesdir}" != "x${binaries}" ]; then
+if [ "x${binariesdir}" != "x"] && \
+    [ "x${binariesdir}" != "x${binaries}" ]; then
     echo "WARNING: Provided binaries dirname does not match with what was computed"
     echo "Provided: ${binariesdir}"
     echo "Computed: ${binaries}"
     binaries=${binariesdir}
 fi
 
-if [ "x${logsdir}" != "x" -a \
-     "x${logsdir}" != "x${logs}" ]; then
+if [ "x${logsdir}" != "x"] && \
+     [ "x${logsdir}" != "x${logs}" ]; then
     echo "WARNING: Provided logs dirname does not match with what was computed"
     echo "Provided: ${logsdir}"
     echo "Computed: ${logs}"