From b7d9ff26d13045b4fa7e9ba64121f70e4c51c5a1 Mon Sep 17 00:00:00 2001 From: erwinvaneyk Date: Wed, 7 Oct 2020 14:23:35 +0200 Subject: [PATCH] Fix generate-internal-groups.sh for bash < 5.x The script fails for older versions of bash, because the expansion of the empty OPENAPI_EXTRA_PACKAGES array fails on older bash versions. The issue was encountered on 3.2.57 (macos), and 4.2.46-34.el7 (latest bash on Centos). The issue was not present on 5.0.18 (macos). This commit patches the issue for older bash versions, by using the '+' operator to avoid expanding OPENAPI_EXTRA_PACKAGES if it is empty. --- staging/src/k8s.io/code-generator/generate-internal-groups.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/staging/src/k8s.io/code-generator/generate-internal-groups.sh b/staging/src/k8s.io/code-generator/generate-internal-groups.sh index 8c31d933705..e4430b27d5b 100755 --- a/staging/src/k8s.io/code-generator/generate-internal-groups.sh +++ b/staging/src/k8s.io/code-generator/generate-internal-groups.sh @@ -114,7 +114,7 @@ if [ "${GENS}" = "all" ] || grep -qw "openapi" <<<"${GENS}"; then echo "Generating OpenAPI definitions for ${GROUPS_WITH_VERSIONS} at ${OUTPUT_PKG}/openapi" declare -a OPENAPI_EXTRA_PACKAGES "${GOPATH}/bin/openapi-gen" \ - --input-dirs "$(codegen::join , "${EXT_FQ_APIS[@]}" "${OPENAPI_EXTRA_PACKAGES[@]}")" \ + --input-dirs "$(codegen::join , "${EXT_FQ_APIS[@]}" "${OPENAPI_EXTRA_PACKAGES[@]+"${OPENAPI_EXTRA_PACKAGES[@]}"}")" \ --input-dirs "k8s.io/apimachinery/pkg/apis/meta/v1,k8s.io/apimachinery/pkg/runtime,k8s.io/apimachinery/pkg/version" \ --output-package "${OUTPUT_PKG}/openapi" \ -O zz_generated.openapi \