From 576a9c0fb90b230c5892e8625fd22f52ba6ab7ea Mon Sep 17 00:00:00 2001 From: Zvonko Kaiser Date: Wed, 5 Mar 2025 23:23:57 +0000 Subject: [PATCH] shellcheck: fix build-base-qemu.sh Fix all warnings and errors Signed-off-by: Zvonko Kaiser --- tools/packaging/static-build/qemu/build-base-qemu.sh | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/tools/packaging/static-build/qemu/build-base-qemu.sh b/tools/packaging/static-build/qemu/build-base-qemu.sh index 1e6862c728..292ae099a8 100755 --- a/tools/packaging/static-build/qemu/build-base-qemu.sh +++ b/tools/packaging/static-build/qemu/build-base-qemu.sh @@ -11,14 +11,9 @@ set -o pipefail script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" readonly qemu_builder="${script_dir}/build-qemu.sh" -# shellcheck source=/dev/null source "${script_dir}/../../scripts/lib.sh" -# shellcheck source=/dev/null source "${script_dir}/../qemu.blacklist" -# Ensure repo_root_dir is available -repo_root_dir="${repo_root_dir:-$(git rev-parse --show-toplevel 2>/dev/null || echo "${script_dir}/../../../..")}" - ARCH=${ARCH:-$(uname -m)} packaging_dir="${script_dir}/../.." @@ -26,8 +21,8 @@ qemu_destdir="/tmp/qemu-static/" container_engine="${USE_PODMAN:+podman}" container_engine="${container_engine:-docker}" -qemu_repo="${qemu_repo:-${1:-}}" -qemu_version="${qemu_version:-${2:-}}" +qemu_repo="${qemu_repo:-$1}" +qemu_version="${qemu_version:-$2}" build_suffix="${3:-}" qemu_tar="${4:-}" @@ -47,7 +42,7 @@ CACHE_TIMEOUT=$(date +"%Y-%m-%d") container_image="${QEMU_CONTAINER_BUILDER:-$(get_qemu_image_name)}" -"${container_engine}" pull "${container_image}" || ("${container_engine}" build \ +${container_engine} pull "${container_image}" || ("${container_engine}" build \ --build-arg CACHE_TIMEOUT="${CACHE_TIMEOUT}" \ --build-arg http_proxy="${http_proxy}" \ --build-arg https_proxy="${https_proxy}" \