github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-22 01:43:04 +00:00
Code Issues Projects Releases Wiki Activity

shellcheck: Fix issues on kata-deploy-merge-builds.sh

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

Signed-off-by: Fabiano Fidêncio <fidencio@northflank.com>
This commit is contained in:
Fabiano Fidêncio 2025-07-20 00:07:24 +02:00
parent aaeb3b3221
commit 55aae75ed7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/packaging/kata-deploy/local-build/kata-deploy-merge-builds.sh
View File

@ -4,7 +4,7 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
[ -z "${DEBUG}" ] || set -x [[ -z "${DEBUG}" ]] || set -x
set -o errexit set -o errexit
set -o nounset set -o nounset
set -o pipefail set -o pipefail
@ -26,13 +26,13 @@ mkdir "${tarball_content_dir}"
for c in kata-static-*.tar.xz for c in kata-static-*.tar.xz
do do
echo "untarring tarball "${c}" into ${tarball_content_dir}" echo "untarring tarball \"${c}\" into ${tarball_content_dir}"
tar -xvf "${c}" -C "${tarball_content_dir}" tar -xvf "${c}" -C "${tarball_content_dir}"
done done
pushd ${tarball_content_dir} pushd "${tarball_content_dir}"
shim="containerd-shim-kata-v2" 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}"} prefix=${shim_path%"bin/${shim}"}
if [[ "${RELEASE:-no}" == "yes" ]] && [[ -f "${repo_root_dir}/VERSION" ]]; then 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. # thus we need to rely on the VERSION file.
cp "${repo_root_dir}/VERSION" "${prefix}/" cp "${repo_root_dir}/VERSION" "${prefix}/"
else else
echo "$(git describe --tags)" > "${prefix}/VERSION" git describe --tags > "${prefix}/VERSION"
fi 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 popd
echo "create ${tar_path}" echo "create ${tar_path}"