Unverified Commit 55ab4b86 authored by Matthew Fisher's avatar Matthew Fisher Committed by GitHub

Merge pull request #2986 from goostleek/bug/installation-script-fix

Installation shell script fix
parents 78d6b930 9a42d718
...@@ -111,8 +111,9 @@ downloadFile() { ...@@ -111,8 +111,9 @@ downloadFile() {
HELM_DIST="helm-$TAG-$OS-$ARCH.tar.gz" HELM_DIST="helm-$TAG-$OS-$ARCH.tar.gz"
DOWNLOAD_URL="https://kubernetes-helm.storage.googleapis.com/$HELM_DIST" DOWNLOAD_URL="https://kubernetes-helm.storage.googleapis.com/$HELM_DIST"
CHECKSUM_URL="$DOWNLOAD_URL.sha256" CHECKSUM_URL="$DOWNLOAD_URL.sha256"
HELM_TMP_FILE="/tmp/$HELM_DIST" HELM_TMP_ROOT="$(mktemp -dt helm-installer-XXXXXX)"
HELM_SUM_FILE="/tmp/$HELM_DIST.sha256" HELM_TMP_FILE="$HELM_TMP_ROOT/$HELM_DIST"
HELM_SUM_FILE="$HELM_TMP_ROOT/$HELM_DIST.sha256"
echo "Downloading $DOWNLOAD_URL" echo "Downloading $DOWNLOAD_URL"
if type "curl" > /dev/null; then if type "curl" > /dev/null; then
curl -SsL "$CHECKSUM_URL" -o "$HELM_SUM_FILE" curl -SsL "$CHECKSUM_URL" -o "$HELM_SUM_FILE"
...@@ -129,7 +130,7 @@ downloadFile() { ...@@ -129,7 +130,7 @@ downloadFile() {
# installFile verifies the SHA256 for the file, then unpacks and # installFile verifies the SHA256 for the file, then unpacks and
# installs it. # installs it.
installFile() { 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 sum=$(openssl sha1 -sha256 ${HELM_TMP_FILE} | awk '{print $2}')
local expected_sum=$(cat ${HELM_SUM_FILE}) local expected_sum=$(cat ${HELM_SUM_FILE})
if [ "$sum" != "$expected_sum" ]; then if [ "$sum" != "$expected_sum" ]; then
...@@ -156,6 +157,7 @@ fail_trap() { ...@@ -156,6 +157,7 @@ fail_trap() {
fi fi
echo -e "\tFor support, go to https://github.com/kubernetes/helm." echo -e "\tFor support, go to https://github.com/kubernetes/helm."
fi fi
cleanup
exit $result exit $result
} }
...@@ -180,6 +182,11 @@ help () { ...@@ -180,6 +182,11 @@ help () {
echo -e "\te.g. --version v2.4.0 or -v latest" 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 # Execution
#Stop execution on any error #Stop execution on any error
...@@ -220,3 +227,4 @@ if ! checkHelmInstalledVersion; then ...@@ -220,3 +227,4 @@ if ! checkHelmInstalledVersion; then
installFile installFile
fi fi
testVersion testVersion
cleanup
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment