diff options
| author | David Spickett <david.spickett@linaro.org> | 2020-04-21 16:06:08 +0100 |
|---|---|---|
| committer | David Spickett <david.spickett@linaro.org> | 2020-04-22 13:53:59 +0100 |
| commit | 2382c087b5f0d51a4556c8c62f4723ab5a0ab7c9 (patch) | |
| tree | 70c781a3087d886dc08a92767b6754991858fd7b /docker-run.sh | |
| parent | 7dac1306e35858ef6485a0abf6222f6e13a28ee0 (diff) | |
Various shellcheck warning fixes
First round of low hanging fruit
from the files with the fewest
warnings.
Change-Id: I60ad57b5bfb2f0be9bb6506252c820f44d055200
Diffstat (limited to 'docker-run.sh')
| -rwxr-xr-x | docker-run.sh | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/docker-run.sh b/docker-run.sh index c244829f..ca347447 100755 --- a/docker-run.sh +++ b/docker-run.sh @@ -2,7 +2,7 @@ set -euf -o pipefail -. $(dirname $0)/jenkins-helpers.sh +. "$(dirname $0)"/jenkins-helpers.sh convert_args_to_variables "$@" shift "$SHIFT_CONVERTED_ARGS" @@ -11,11 +11,12 @@ WORKSPACE="${WORKSPACE-}" prefix="${prefix-}" case "$qemu" in - "") $(dirname $0)/start-container-docker.sh "${CONVERTED_ARGS[@]:1}" > container.sh ;; - *) $(dirname $0)/start-container-qemu.sh "${CONVERTED_ARGS[@]:1}" > container.sh ;; + "") "$(dirname $0)"/start-container-docker.sh "${CONVERTED_ARGS[@]:1}" > container.sh ;; + *) "$(dirname $0)"/start-container-qemu.sh "${CONVERTED_ARGS[@]:1}" > container.sh ;; esac # Where prefix is something like "run_" or "test_" +# shellcheck disable=SC2064 trap "${prefix}container_cleanup" EXIT . ./container.sh @@ -27,6 +28,8 @@ if [ "x$WORKSPACE" != "x" ]; then fi JENKINS_FLOCK="flock $WORKSPACE" else + # Used by remote_exec later + # shellcheck disable=SC2034 JENKINS_FLOCK="" fi |