diff --git a/hack/verify-api-reference-docs.sh b/hack/verify-api-reference-docs.sh index 8cbfba79759..2cc0535f6bf 100755 --- a/hack/verify-api-reference-docs.sh +++ b/hack/verify-api-reference-docs.sh @@ -29,6 +29,7 @@ API_REFERENCE_DOCS_ROOT="${KUBE_ROOT}/docs/api-reference" OUTPUT_DIR="${KUBE_ROOT}/_tmp/api-reference" mkdir -p ${OUTPUT_DIR} TMP_ROOT="${KUBE_ROOT}/_tmp" +trap "rm -rf ${TMP_ROOT}" EXIT SIGINT # Generate API reference docs in tmp. "./hack/update-api-reference-docs.sh" "${OUTPUT_DIR}" @@ -36,7 +37,6 @@ TMP_ROOT="${KUBE_ROOT}/_tmp" echo "diffing ${API_REFERENCE_DOCS_ROOT} against freshly generated docs" ret=0 diff -NauprB -I 'Last update' --exclude=*.md "${API_REFERENCE_DOCS_ROOT}" "${OUTPUT_DIR}" || ret=$? -rm -rf "${TMP_ROOT}" if [[ $ret -eq 0 ]] then echo "${API_REFERENCE_DOCS_ROOT} up to date." diff --git a/hack/verify-codecgen.sh b/hack/verify-codecgen.sh index c1a65836bdc..c71280a6cee 100755 --- a/hack/verify-codecgen.sh +++ b/hack/verify-codecgen.sh @@ -35,6 +35,13 @@ generated_files=($( \) -prune \ \) -name '*.generated.go')) +function cleanup { + for generated_file in ${generated_files[@]}; do + rm -f "${generated_file}.original" + done +} +trap cleanup EXIT SIGINT + for generated_file in ${generated_files[@]}; do cat "${generated_file}" > "${generated_file}.original" done @@ -53,7 +60,6 @@ for generated_file in ${generated_files[@]}; do ret=1 fi - rm -f "${generated_file}.original" done exit $ret diff --git a/hack/verify-generated-swagger-docs.sh b/hack/verify-generated-swagger-docs.sh index f7ff66ed7ba..19bcbca0689 100755 --- a/hack/verify-generated-swagger-docs.sh +++ b/hack/verify-generated-swagger-docs.sh @@ -43,6 +43,7 @@ TMP_DIFFROOT="${KUBE_ROOT}/_tmp/pkg" _tmp="${KUBE_ROOT}/_tmp" mkdir -p "${_tmp}" +trap "rm -rf ${_tmp}" EXIT SIGINT cp -a "${DIFFROOT}" "${TMP_DIFFROOT}" "${KUBE_ROOT}/hack/update-generated-swagger-docs.sh" @@ -50,7 +51,6 @@ echo "diffing ${DIFFROOT} against freshly generated swagger type documentation" ret=0 diff -Naupr -I 'Auto generated by' "${DIFFROOT}" "${TMP_DIFFROOT}" || ret=$? cp -a "${TMP_DIFFROOT}" "${KUBE_ROOT}/" -rm -rf "${_tmp}" if [[ $ret -eq 0 ]] then echo "${DIFFROOT} up to date." diff --git a/hack/verify-swagger-spec.sh b/hack/verify-swagger-spec.sh index e73cb07a8b9..030eee13c02 100755 --- a/hack/verify-swagger-spec.sh +++ b/hack/verify-swagger-spec.sh @@ -32,6 +32,7 @@ TMP_SPECROOT="${KUBE_ROOT}/_tmp/swagger-spec" _tmp="${KUBE_ROOT}/_tmp" mkdir -p "${_tmp}" +trap "rm -rf ${_tmp}" EXIT SIGINT cp -a "${SPECROOT}" "${TMP_SPECROOT}" "${KUBE_ROOT}/hack/update-swagger-spec.sh" @@ -39,7 +40,6 @@ echo "diffing ${SPECROOT} against freshly generated swagger spec" ret=0 diff -Naupr -I 'Auto generated by' "${SPECROOT}" "${TMP_SPECROOT}" || ret=$? cp -a ${TMP_SPECROOT} "${KUBE_ROOT}/api" -rm -rf "${_tmp}" if [[ $ret -eq 0 ]] then echo "${SPECROOT} up to date."