mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-09-20 00:07:55 +00:00
scripts: Change here document delimiters
Fix the outstanding scripts using non standard shell here document delimiters. This should have been caught by https://github.com/kata-containers/tests/pull/3937, but there is a bug in the checker which is fixed on https://github.com/kata-containers/tests/pull/4569. Fixes: #3864. Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
This commit is contained in:
@@ -12,7 +12,7 @@ script_dir="$(realpath $(dirname $0))"
|
||||
patches_dir="$1"
|
||||
|
||||
if [ -z "$patches_dir" ]; then
|
||||
cat <<-EOT
|
||||
cat <<-EOF
|
||||
Apply patches to the sources at the current directory.
|
||||
|
||||
Patches are expected to be named in the standard git-format-patch(1) format where
|
||||
@@ -30,7 +30,7 @@ if [ -z "$patches_dir" ]; then
|
||||
$0 PATCHES_DIR
|
||||
Where:
|
||||
PATCHES_DIR is the directory containing the patches
|
||||
EOT
|
||||
EOF
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
@@ -72,7 +72,7 @@ die() {
|
||||
|
||||
# Display usage to stdout.
|
||||
usage() {
|
||||
cat <<EOT
|
||||
cat <<EOF
|
||||
Overview:
|
||||
|
||||
Display configure options required to build the specified
|
||||
@@ -94,7 +94,7 @@ Example:
|
||||
|
||||
$ $script_name qemu
|
||||
|
||||
EOT
|
||||
EOF
|
||||
}
|
||||
|
||||
show_tags_header() {
|
||||
@@ -102,10 +102,10 @@ show_tags_header() {
|
||||
local key
|
||||
local value
|
||||
|
||||
cat <<EOT
|
||||
cat <<EOF
|
||||
# Recognised option tags:
|
||||
#
|
||||
EOT
|
||||
EOF
|
||||
|
||||
# sort the tags
|
||||
keys=${!recognised_tags[@]}
|
||||
|
@@ -55,7 +55,7 @@ gen_version_file() {
|
||||
# see https://github.com/semver/semver/issues/145
|
||||
kata_version=$(get_kata_version)
|
||||
kata_version=${kata_version/-/\~}
|
||||
cat > "$versions_txt" <<EOT
|
||||
cat > "$versions_txt" <<EOF
|
||||
# This is a generated file from ${script_name}
|
||||
|
||||
kata_version=${kata_version}
|
||||
@@ -70,7 +70,7 @@ kernel_version=${kernel_version}
|
||||
|
||||
# Golang
|
||||
go_version=${golang_version}
|
||||
EOT
|
||||
EOF
|
||||
}
|
||||
|
||||
die() {
|
||||
@@ -85,7 +85,7 @@ die() {
|
||||
|
||||
usage() {
|
||||
exit_code=$"${1:-0}"
|
||||
cat <<EOT
|
||||
cat <<EOF
|
||||
Usage:
|
||||
${script_name} [--compare | -h | --help] <kata-branch>
|
||||
|
||||
@@ -98,7 +98,7 @@ Options:
|
||||
--compare Only compare the kata version at branch <kata-branch> with the
|
||||
one in ${versions_txt} and leave the file untouched.
|
||||
--head Use <kata-branch>'s head to generate the versions file.
|
||||
EOT
|
||||
EOF
|
||||
exit "${exit_code}"
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user