From 55aae75ed7202d23cc3bf16fbb3dd6313d97f797 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@northflank.com>
Date: Sun, 20 Jul 2025 00:07:24 +0200
Subject: [PATCH] shellcheck: Fix issues on kata-deploy-merge-builds.sh
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As we're already touching the file, let's get those fixed.

Signed-off-by: Fabiano Fidêncio <fidencio@northflank.com>
---
 .../local-build/kata-deploy-merge-builds.sh          | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/packaging/kata-deploy/local-build/kata-deploy-merge-builds.sh b/tools/packaging/kata-deploy/local-build/kata-deploy-merge-builds.sh
index 1a0944a6d4..5bf7df3b37 100755
--- a/tools/packaging/kata-deploy/local-build/kata-deploy-merge-builds.sh
+++ b/tools/packaging/kata-deploy/local-build/kata-deploy-merge-builds.sh
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-[ -z "${DEBUG}" ] || set -x
+[[ -z "${DEBUG}" ]] || set -x
 set -o errexit
 set -o nounset
 set -o pipefail
@@ -26,13 +26,13 @@ mkdir "${tarball_content_dir}"
 
 for c in kata-static-*.tar.xz
 do
-	echo "untarring tarball "${c}" into ${tarball_content_dir}"
+	echo "untarring tarball \"${c}\" into ${tarball_content_dir}"
 	tar -xvf "${c}" -C "${tarball_content_dir}"
 done
 
-pushd ${tarball_content_dir}
+pushd "${tarball_content_dir}"
 	shim="containerd-shim-kata-v2"
-	shim_path=$(find . -name ${shim} | sort | head -1)
+	shim_path=$(find . -name "${shim}" | sort | head -1)
 	prefix=${shim_path%"bin/${shim}"}
 
 	if [[ "${RELEASE:-no}" == "yes" ]] && [[ -f "${repo_root_dir}/VERSION" ]]; then
@@ -40,9 +40,9 @@ pushd ${tarball_content_dir}
 		# thus we need to rely on the VERSION file.
 		cp "${repo_root_dir}/VERSION" "${prefix}/"
 	else
-		echo "$(git describe --tags)" > "${prefix}/VERSION"
+		git describe --tags > "${prefix}/VERSION"
 	fi
-	[[ -n "${kata_versions_yaml_file}" ]] && cp ${kata_versions_yaml_file_path} ${prefix}/
+	[[ -n "${kata_versions_yaml_file}" ]] && cp "${kata_versions_yaml_file_path}" "${prefix}/"
 popd
 
 echo "create ${tar_path}"