From 42bc36d24093c6b1f4a6fb4c4df7a79be7e82151 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20K=C5=82opotek?= Date: Fri, 29 Sep 2017 16:39:42 +0200 Subject: [PATCH] Fixes shell installation script #2977 --- scripts/get | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/scripts/get b/scripts/get index 88a6fa1a7..9f4760123 100755 --- a/scripts/get +++ b/scripts/get @@ -111,8 +111,10 @@ downloadFile() { HELM_DIST="helm-$TAG-$OS-$ARCH.tar.gz" DOWNLOAD_URL="https://kubernetes-helm.storage.googleapis.com/$HELM_DIST" CHECKSUM_URL="$DOWNLOAD_URL.sha256" - HELM_TMP_FILE="/tmp/$HELM_DIST" - HELM_SUM_FILE="/tmp/$HELM_DIST.sha256" + HELM_TMP_ROOT="/tmp/$(whoami)" + HELM_TMP_FILE="$HELM_TMP_ROOT/$HELM_DIST" + HELM_SUM_FILE="$HELM_TMP_ROOT/$HELM_DIST.sha256" + mkdir -p "$HELM_TMP_ROOT" echo "Downloading $DOWNLOAD_URL" if type "curl" > /dev/null; then curl -SsL "$CHECKSUM_URL" -o "$HELM_SUM_FILE" @@ -129,7 +131,7 @@ downloadFile() { # installFile verifies the SHA256 for the file, then unpacks and # installs it. installFile() { - HELM_TMP="/tmp/$PROJECT_NAME" + HELM_TMP="$HELM_TMP_ROOT/$PROJECT_NAME" local sum=$(openssl sha1 -sha256 ${HELM_TMP_FILE} | awk '{print $2}') local expected_sum=$(cat ${HELM_SUM_FILE}) if [ "$sum" != "$expected_sum" ]; then @@ -156,6 +158,7 @@ fail_trap() { fi echo -e "\tFor support, go to https://github.com/kubernetes/helm." fi + cleanup exit $result } @@ -180,6 +183,11 @@ help () { echo -e "\te.g. --version v2.4.0 or -v latest" } +# cleanup temporary files to avoid https://github.com/kubernetes/helm/issues/2977 +cleanup() { + rm -rf "$HELM_TMP_ROOT" +} + # Execution #Stop execution on any error @@ -200,7 +208,7 @@ while [[ $# -gt 0 ]]; do exit 0 fi ;; - '--help'|-h) + '--help'|-h) help exit 0 ;; @@ -220,3 +228,4 @@ if ! checkHelmInstalledVersion; then installFile fi testVersion +cleanup