From b33429c1f316b9a19c4bf1951eee13b1120874cf Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Sat, 15 Jun 2019 12:05:43 +0200 Subject: Fix ShellCheck warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Idf571b39d38b9184b2e08c183d4afe44784fbfe6 Signed-off-by: Cédric Ollivier (cherry picked from commit db7c7d3031c8f9a562c6e3db0922e1cfb92ea92b) --- build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.sh b/build.sh index d7d726266..ce6f9deea 100644 --- a/build.sh +++ b/build.sh @@ -19,7 +19,7 @@ docker/smoke \ docker/benchmarking \ docker/features"} arm64_dirs=${arm64_dirs-${amd64_dirs}} -build_opts=(--pull=true --no-cache --force-rm=true) +build_opts=("--pull=true" --no-cache "--force-rm=true") find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-core:hunter|${repo}/functest-core:amd64-hunter|g" {} + @@ -35,7 +35,7 @@ for dir in ${amd64_dirs}; do [ "${dir}" != "docker/core" ] && (docker rmi "${repo}/functest-${dir##**/}:amd64-hunter" || true) done -[ ! -z "${amd64_dirs}" ] && +[ -n "${amd64_dirs}" ] && (docker rmi "${repo}/functest-core:amd64-hunter" alpine:3.9 || true) find . -name Dockerfile -exec git checkout {} + @@ -54,7 +54,7 @@ for dir in ${arm64_dirs}; do [ "${dir}" != "docker/core" ] && (docker rmi "${repo}/functest-${dir##**/}:arm64-hunter" || true) done -[ ! -z "${arm64_dirs}" ] && +[ -n "${arm64_dirs}" ] && (docker rmi "${repo}/functest-core:arm64-hunter" \ multiarch/alpine:arm64-v3.9 || true) find . -name Dockerfile -exec git checkout {} + @@ -74,7 +74,7 @@ for dir in ${arm_dirs}; do [ "${dir}" != "docker/core" ] && (docker rmi "${repo}/functest-${dir##**/}:arm-hunter" || true) done -[ ! -z "${arm_dirs}" ] && +[ -n "${arm_dirs}" ] && (docker rmi "${repo}/functest-core:arm-hunter" \ multiarch/alpine:armhf-v3.9 || true) find . -name Dockerfile -exec git checkout {} + -- cgit 1.2.3-korg