From 2ba635b2cddf7e4ede7d986873a544be9af9e287 Mon Sep 17 00:00:00 2001 From: Isaac Hollander McCreery Date: Thu, 28 Apr 2016 11:00:28 -0700 Subject: [PATCH] release scripts respect TMPDIR --- release/build-official-release.sh | 3 ++- release/cut-official-release.sh | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/release/build-official-release.sh b/release/build-official-release.sh index 672121551a0..0e888bb5baf 100755 --- a/release/build-official-release.sh +++ b/release/build-official-release.sh @@ -43,6 +43,7 @@ function sha1() { declare -r KUBE_GITHUB="https://github.com/kubernetes/kubernetes.git" declare -r KUBE_RELEASE_VERSION=${1-} +declare -r TMPDIR=${TMPDIR:-"/tmp"} declare -r KUBE_RELEASE_UMASK=${KUBE_RELEASE_UMASK:-022} VERSION_REGEX="^v(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)(-(beta|alpha)\\.(0|[1-9][0-9]*))?$" @@ -65,7 +66,7 @@ else KUBE_RELEASE_TYPE="stable" fi -declare -r KUBE_BUILD_DIR=$(mktemp -d "/tmp/kubernetes-build-release-${KUBE_RELEASE_VERSION}-XXXXXXX") +declare -r KUBE_BUILD_DIR=$(mktemp -d "${TMPDIR}/kubernetes-build-release-${KUBE_RELEASE_VERSION}-XXXXXXX") # Set the default umask for the release. This ensures consistency # across our release builds. diff --git a/release/cut-official-release.sh b/release/cut-official-release.sh index 68e712c5b29..9f101d88d6c 100755 --- a/release/cut-official-release.sh +++ b/release/cut-official-release.sh @@ -92,11 +92,12 @@ function main() { local -r release_umask=${release_umask:-022} umask "${release_umask}" + declare -r TMPDIR=${TMPDIR:-"/tmp"} local -r github="https://github.com/kubernetes/kubernetes.git" - declare -r DIR=$(mktemp -d "/tmp/kubernetes-${release_type}-release-${new_version}-XXXXXXX") + declare -r DIR=$(mktemp -d "${TMPDIR}/kubernetes-${release_type}-release-${new_version}-XXXXXXX") # Start a tmp file that will hold instructions for the user. - declare -r INSTRUCTIONS=$(mktemp "/tmp/kubernetes-${release_type}-release-${new_version}-instructions-XXXXXXX") + declare -r INSTRUCTIONS=$(mktemp "${TMPDIR}/kubernetes-${release_type}-release-${new_version}-instructions-XXXXXXX") if $DRY_RUN; then cat > "${INSTRUCTIONS}" <<- EOM Success on dry run! Do