tcwg-benchmark.sh: Make shellcheck clean

Change-Id: If759950c71f7478a5a94fc5cc1e53244bb75d379

1 files changed, 26 insertions, 22 deletions

diff --git a/tcwg-benchmark.sh b/tcwg-benchmark.sh
index 8350e019..ec3c2bdf 100755
--- a/tcwg-benchmark.sh
+++ b/tcwg-benchmark.sh
@@ -1,10 +1,12 @@
 #!/bin/bash
 
+# Clean: shellcheck -e 2001 ./tcwg-benchmark.sh
+
 set -exu
 
 usage ()
 {
-    echo "ERROR: Unsupported options: $@"
+    echo "ERROR: Unsupported options:" "$@"
     exit 1
 }
 
@@ -17,8 +19,8 @@ while [ $# -ge 1 ]; do
 	--sysroot) sysroot="$2" ;;
 	--fileserver) fileserver="$2" ;;
 	--forceinstall) forceinstall="$2" ;;
-	--scripts_branch) scripts_branch="$2" ;;
-	--label) label="$2" ;;
+	--scripts_branch) scripts_branch="$2"; scripts_branch="$scripts_branch" ;;
+	--label) label="$2"; label="$label" ;;
 	--build_number) BUILD_NUMBER="$2" ;;
 	--node_name) NODE_NAME="$2" ;;
 	--workspace) WORKSPACE="$2" ;;
@@ -27,38 +29,40 @@ while [ $# -ge 1 ]; do
     shift 2
 done
 
-wget --progress=dot:giga --no-check-certificate ${toolchain_url}
-tarball=$(basename ${toolchain_url})
-tar xf ${tarball}
-toolchaindir=$(echo ${tarball} | sed 's/.tar.xz//')
-ccpath=$(find $WORKSPACE/$toolchaindir -name "*-gcc")
-ccprefix=$(echo $ccpath | sed -e 's/-gcc$/-/')
+wget --progress=dot:giga --no-check-certificate "${toolchain_url}"
+tarball=$(basename "${toolchain_url}")
+tar xf "${tarball}"
+toolchaindir=$(echo "${tarball}" | sed 's/.tar.xz//')
+ccpath=$(find "$WORKSPACE/$toolchaindir" -name "*-gcc")
+ccprefix=$(echo "$ccpath" | sed -e 's/-gcc$/-/')
 
 # Slaves for this job are virtual slaves on dev-01,
 # convert the slave name into the target board name
-boardname=$(echo ${NODE_NAME} | sed 's/-bmk//').tcwglab
+boardname=$(echo "${NODE_NAME}" | sed 's/-bmk//').tcwglab
 boardname="tcwg-benchmark@${boardname}"
 
-ssh $boardname rm -rf bmk-scripts
-ssh $boardname git clone https://git-us.linaro.org/toolchain/bmk-scripts
+ssh "$boardname" rm -rf bmk-scripts
+ssh "$boardname" git clone https://git-us.linaro.org/toolchain/bmk-scripts
 
-./start-container-docker.sh --arch amd64 --node $NODE_NAME --distro trusty --task build --prefix build_ > build-container.sh
+./start-container-docker.sh --arch amd64 --node "$NODE_NAME" --distro trusty --task build --prefix build_ > build-container.sh
+build_container_host=
+build_container_port=
 . ./build-container.sh
 
 # Make sure to cleanup build container if something goes
 # wrong when preparing the test environment
 trap "cleanup_all_containers" EXIT
 
-build_container_exec ssh -t $boardname bmk-scripts/run.sh \
-                     --bench $(printf '%q' "$bench_list") \
-                     --config ${config} \
-                     --cflags $(printf '%q' "$cflags") \
-                     --ccprefix $build_container_host:$build_container_port:$ccprefix \
-                     ${sysroot:+--sysroot "$sysroot"} \
+build_container_exec ssh -t "$boardname" bmk-scripts/run.sh \
+                     --bench "$(printf '%q' "$bench_list")" \
+                     --config "${config}" \
+                     --cflags "$(printf '%q' "$cflags")" \
+                     --ccprefix "$build_container_host:$build_container_port:$ccprefix" \
+                     "${sysroot:+--sysroot "$sysroot"}" \
                      --toolchain gnu \
-                     --resultsdest ${fileserver}:results/${NODE_NAME}-123-0/${BUILD_NUMBER} \
-                     --nodename ${NODE_NAME} \
-                     --forceinstall ${forceinstall} \
+                     --resultsdest "${fileserver}:results/${NODE_NAME}-123-0/${BUILD_NUMBER}" \
+                     --nodename "${NODE_NAME}" \
+                     --forceinstall "${forceinstall}" \
                      --verbose true
 
 exit 0