diff options
| author | Austin S. Hemmelgarn <austin@netdata.cloud> | 2024-01-24 08:21:35 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-24 08:21:35 -0500 |
| commit | 5b8355117adbf10d9c16e89137e4ac326b512a08 (patch) | |
| tree | bd0104a6d52842d5572a66ac3792d8ba1f6f1bfa | |
| parent | eec55449d1f64eca6bfe9a075d2a619617ab7857 (diff) | |
Fix directory handling in Go toolchain handling script. (#16828)
| -rw-r--r-- | packaging/check-for-go-toolchain.sh | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/packaging/check-for-go-toolchain.sh b/packaging/check-for-go-toolchain.sh index e75cd29d95..6303ddecbb 100644 --- a/packaging/check-for-go-toolchain.sh +++ b/packaging/check-for-go-toolchain.sh @@ -17,6 +17,8 @@ GOLANG_MIN_MAJOR_VERSION='1' GOLANG_MIN_MINOR_VERSION='21' GOLANG_MIN_PATCH_VERSION='0' +GOLANG_TEMP_PATH="${TMPDIR}/go-toolchain" + check_go_version() { version="$("${go}" version | awk '{ print $3 }' | sed 's/^go//')" version_major="$(echo "${version}" | cut -f 1 -d '.')" @@ -43,7 +45,6 @@ check_go_version() { } install_go_toolchain() { - GOLANG_TEMP_PATH="${TMPDIR}/go-toolchain" GOLANG_ARCHIVE_NAME="${GOLANG_TEMP_PATH}/golang.tar.gz" GOLANG_CHECKSUM_FILE="${GOLANG_TEMP_PATH}/golang.sha256sums" @@ -92,7 +93,9 @@ install_go_toolchain() { return 1 fi - if ! curl --fail -q -sSL --connect-timeout 10 --retry 3 --output "/tmp/${GOLANG_ARCHIVE_NAME}" "${GOLANG_ARCHIVE_URL}"; then + mkdir -p "${GOLANG_TEMP_PATH}" + + if ! curl --fail -q -sSL --connect-timeout 10 --retry 3 --output "${GOLANG_ARCHIVE_NAME}" "${GOLANG_ARCHIVE_URL}"; then GOLANG_FAILURE_REASON="Failed to download Go toolchain." return 1 fi @@ -127,6 +130,8 @@ ensure_go_toolchain() { if ! install_go_toolchain; then return 1 fi + + rm -rf "${GOLANG_TEMP_PATH}" || true fi return 0 |