github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-04-27 19:35:32 +00:00
Code Issues Projects Releases Wiki Activity

ci: shellcheck - collection of fixes

Browse Source 
manual fixes of various issues.

Related to: #10951

Signed-off-by: Lukáš Doktor <ldoktor@redhat.com>
This commit is contained in:
Lukáš Doktor 2025-03-19 10:46:56 +01:00
parent f62e08998c
commit 7e11489daf
No known key found for this signature in database
GPG Key ID: 26B362E47FCF22C1
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ci/gh-util.sh
View File

@ -95,7 +95,7 @@ list_issues_for_pr()
echo "# Fields: issue_number" echo "# Fields: issue_number"
local issue local issue
echo "${issues}"|while read issue echo "${issues}" | while read -r issue
do do
printf "%s\n" "${issue}" printf "%s\n" "${issue}"
done done
@ -112,7 +112,7 @@ list_labels_for_issue()
[[ -z "${labels}" ]] && die "cannot determine labels for issue ${issue}" [[ -z "${labels}" ]] && die "cannot determine labels for issue ${issue}"
printf "${labels}" echo "${labels}"
} }
setup() setup()
@ -134,10 +134,11 @@ handle_args()
case "${opt}" in case "${opt}" in
h) usage && exit 0 ;; h) usage && exit 0 ;;
r) repo="${OPTARG}" ;; r) repo="${OPTARG}" ;;
*) echo "use '-h' to get list of supprted aruments" && exit 1 ;;
esac esac
done done
shift $((${OPTIND} - 1)) shift $((OPTIND - 1))
local repo="${repo:-kata-containers/kata-containers}" local repo="${repo:-kata-containers/kata-containers}"
local cmd="${1:-}" local cmd="${1:-}"

5
ci/install_libseccomp.sh
View File

@ -8,7 +8,6 @@
set -o errexit set -o errexit
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
script_name="$(basename "${BASH_SOURCE[0]}")"
source "${script_dir}/../tests/common.bash" source "${script_dir}/../tests/common.bash"
@ -47,7 +46,7 @@ gperf_tarball_url="${gperf_url}/${gperf_tarball}"
# We need to build the libseccomp library from sources to create a static library for the musl libc. # We need to build the libseccomp library from sources to create a static library for the musl libc.
# However, ppc64le and s390x have no musl targets in Rust. Hence, we do not set cflags for the musl libc. # However, ppc64le and s390x have no musl targets in Rust. Hence, we do not set cflags for the musl libc.
if ([[ "${arch}" != "ppc64le" ]] && [[ "${arch}" != "s390x" ]]); then if [[ "${arch}" != "ppc64le" ]] && [[ "${arch}" != "s390x" ]]; then
# Set FORTIFY_SOURCE=1 because the musl-libc does not have some functions about FORTIFY_SOURCE=2 # Set FORTIFY_SOURCE=1 because the musl-libc does not have some functions about FORTIFY_SOURCE=2
cflags="-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 -O2" cflags="-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 -O2"
fi fi
@ -71,7 +70,7 @@ build_and_install_gperf() {
tar -xf "${gperf_tarball}" tar -xf "${gperf_tarball}"
pushd "gperf-${gperf_version}" pushd "gperf-${gperf_version}"
# Unset $CC for configure, we will always use native for gperf # Unset $CC for configure, we will always use native for gperf
CC= ./configure --prefix="${gperf_install_dir}" CC="" ./configure --prefix="${gperf_install_dir}"
make make
make install make install
export PATH=${PATH}:"${gperf_install_dir}"/bin export PATH=${PATH}:"${gperf_install_dir}"/bin

3
ci/install_yq.sh
View File

@ -107,8 +107,7 @@ function install_yq() {
## NOTE: ${var,,} => gives lowercase value of var ## NOTE: ${var,,} => gives lowercase value of var
local yq_url="https://${yq_pkg}/releases/download/${yq_version}/yq_${goos}_${goarch}" local yq_url="https://${yq_pkg}/releases/download/${yq_version}/yq_${goos}_${goarch}"
${precmd} curl -o "${yq_path}" -LSsf "${yq_url}" ${precmd} curl -o "${yq_path}" -LSsf "${yq_url}" || die "Download ${yq_url} failed"
[[ $? -ne 0 ]] && die "Download ${yq_url} failed"
${precmd} chmod +x "${yq_path}" ${precmd} chmod +x "${yq_path}"
if ! command -v "${yq_path}" >/dev/null; then if ! command -v "${yq_path}" >/dev/null; then