github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-20 02:10:46 +00:00
Code Issues Projects Releases Wiki Activity

osbuilder: lib.sh: Fix indent

Browse Source 
Replace 4 spaces to [tab].

Signed-off-by: Rong Tao <rongtao@cestc.cn>
This commit is contained in:
Rong Tao 2025-05-13 16:54:15 +08:00
parent 299fb3b77b
commit 37a16c19d1
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tools/osbuilder/scripts/lib.sh
View File

@ -237,7 +237,7 @@ generate_dockerfile()
ENV http_proxy=${http_proxy:-} ENV http_proxy=${http_proxy:-}
ENV https_proxy=${http_proxy:-} ENV https_proxy=${http_proxy:-}
RUN curl --proto '=https' --tlsv1.2 https://sh.rustup.rs -sSLf | \ RUN curl --proto '=https' --tlsv1.2 https://sh.rustup.rs -sSLf | \
sh -s -- -y --default-toolchain ${RUST_VERSION} -t ${rustarch}-unknown-linux-${LIBC} sh -s -- -y --default-toolchain ${RUST_VERSION} -t ${rustarch}-unknown-linux-${LIBC}
RUN . /root/.cargo/env; cargo install cargo-when RUN . /root/.cargo/env; cargo install cargo-when
" "
fi fi
@ -255,24 +255,24 @@ RUN . /root/.cargo/env; cargo install cargo-when
get_package_version_from_kata_yaml() get_package_version_from_kata_yaml()
{ {
local yq_path="$1" local yq_path="$1"
local yq_version local yq_version
local yq_args local yq_args
typeset -r yq=$(command -v yq || command -v "${GOPATH}/bin/yq" || echo "${GOPATH}/bin/yq") typeset -r yq=$(command -v yq || command -v "${GOPATH}/bin/yq" || echo "${GOPATH}/bin/yq")
if [ ! -f "$yq" ]; then if [ ! -f "$yq" ]; then
source "$yq_file" source "$yq_file"
fi fi
yq_version=$($yq -V) yq_version=$($yq -V)
case $yq_version in case $yq_version in
*"version "[1-3]*) *"version "[1-3]*)
yq_args="r -X - ${yq_path}" yq_args="r -X - ${yq_path}"
;; ;;
*) *)
yq_args="e .${yq_path} -" yq_args="e .${yq_path} -"
;; ;;
esac esac
PKG_VERSION="$(cat "${kata_versions_file}" | $yq ${yq_args})" PKG_VERSION="$(cat "${kata_versions_file}" | $yq ${yq_args})"
@ -282,7 +282,7 @@ get_package_version_from_kata_yaml()
detect_rust_version() detect_rust_version()
{ {
info "Detecting agent rust version" info "Detecting agent rust version"
local yq_path="languages.rust.meta.newest-version" local yq_path="languages.rust.meta.newest-version"
info "Get rust version from ${kata_versions_file}" info "Get rust version from ${kata_versions_file}"
RUST_VERSION="$(get_package_version_from_kata_yaml "$yq_path")" RUST_VERSION="$(get_package_version_from_kata_yaml "$yq_path")"