diff options
| author | Austin S. Hemmelgarn <austin@netdata.cloud> | 2021-04-08 11:26:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-08 11:26:22 -0400 |
| commit | 53b51bc800a445668f9e66995b0c20977bcf7819 (patch) | |
| tree | 91af002ddedb650cd7c71c0f0e537aa2167a19cb | |
| parent | e8f3c58be40d4d733b4d5ca76415a3a56fa14e0c (diff) | |
Don’t use glob expansion in argument to `cd` in updater. (#10936)
| -rwxr-xr-x | packaging/installer/netdata-updater.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/packaging/installer/netdata-updater.sh b/packaging/installer/netdata-updater.sh index 46f7975f09..ad74122553 100755 --- a/packaging/installer/netdata-updater.sh +++ b/packaging/installer/netdata-updater.sh @@ -234,13 +234,11 @@ parse_version() { } get_latest_version() { - local latest if [ "${RELEASE_CHANNEL}" == "stable" ]; then - latest="$(download "https://api.github.com/repos/netdata/netdata/releases/latest" /dev/stdout | grep tag_name | cut -d'"' -f4)" + download "https://api.github.com/repos/netdata/netdata/releases/latest" /dev/stdout | grep tag_name | cut -d'"' -f4 else - latest="$(download "$NETDATA_NIGHTLIES_BASEURL/latest-version.txt" /dev/stdout)" + download "$NETDATA_NIGHTLIES_BASEURL/latest-version.txt" /dev/stdout fi - parse_version "$latest" } set_tarball_urls() { @@ -272,7 +270,9 @@ update() { download "${NETDATA_TARBALL_CHECKSUM_URL}" "${ndtmpdir}/sha256sum.txt" >&3 2>&3 current_version="$(command -v netdata > /dev/null && parse_version "$(netdata -v | cut -f 2 -d ' ')")" - latest_version="$(get_latest_version)" + latest_tag="$(get_latest_version)" + latest_version="$(parse_version "${latest_tag}")" + path_version="$(echo "${latest_tag}" | cut -f 1 -d "-")" # If we can't get the current version for some reason assume `0` current_version="${current_version:-0}" @@ -295,7 +295,7 @@ update() { NEW_CHECKSUM="$(safe_sha256sum netdata-latest.tar.gz 2> /dev/null | cut -d' ' -f1)" tar -xf netdata-latest.tar.gz >&3 2>&3 rm netdata-latest.tar.gz >&3 2>&3 - cd netdata-* || exit 1 + cd "$(find . -maxdepth 1 -name "netdata-${path_version}*" | head -n 1)" || exit 1 RUN_INSTALLER=1 cd "${NETDATA_LOCAL_TARBALL_OVERRIDE}" || exit 1 fi |