Don’t use glob expansion in argument to `cd` in updater. (#10936)
Austin S. Hemmelgarn committed
Apr 8, 2021 at 11:26 UTC
53b51bc800a445668f9e66995b0c20977bcf7819
1 file changed
+6
-6
packaging/installer/netdata-updater.sh
+6
-6
@@ -234,13 +234,11 @@ parse_version() {
234
}
235
236
get_latest_version() {
237
- local latest
237
if [ "${RELEASE_CHANNEL}" == "stable" ]; then
239
- latest="$(download "https://api.github.com/repos/netdata/netdata/releases/latest" /dev/stdout | grep tag_name | cut -d'"' -f4)"
238
+ download "https://api.github.com/repos/netdata/netdata/releases/latest" /dev/stdout | grep tag_name | cut -d'"' -f4
239
else
241
- latest="$(download "$NETDATA_NIGHTLIES_BASEURL/latest-version.txt" /dev/stdout)"
240
+ download "$NETDATA_NIGHTLIES_BASEURL/latest-version.txt" /dev/stdout
241
fi
243
- parse_version "$latest"
242
}
243
244
set_tarball_urls() {
@@ -272,7 +270,9 @@ update() {
270
download "${NETDATA_TARBALL_CHECKSUM_URL}" "${ndtmpdir}/sha256sum.txt" >&3 2>&3
271
272
current_version="$(command -v netdata > /dev/null && parse_version "$(netdata -v | cut -f 2 -d ' ')")"
275
- latest_version="$(get_latest_version)"
273
+ latest_tag="$(get_latest_version)"
274
+ latest_version="$(parse_version "${latest_tag}")"
275
+ path_version="$(echo "${latest_tag}" | cut -f 1 -d "-")"
276
277
# If we can't get the current version for some reason assume `0`
278
current_version="${current_version:-0}"
@@ -295,7 +295,7 @@ update() {
295
NEW_CHECKSUM="$(safe_sha256sum netdata-latest.tar.gz 2> /dev/null | cut -d' ' -f1)"
296
tar -xf netdata-latest.tar.gz >&3 2>&3
297
rm netdata-latest.tar.gz >&3 2>&3
298
- cd netdata-* || exit 1
298
+ cd "$(find . -maxdepth 1 -name "netdata-${path_version}*" | head -n 1)" || exit 1
299
RUN_INSTALLER=1
300
cd "${NETDATA_LOCAL_TARBALL_OVERRIDE}" || exit 1
301
fi