Fix the netdata-updater.sh to correctly pass REINSTALL_OPTIONS (finally) (#8808)
* Add support for overriding the URL for installing/updating nightlies * Fix bug with running the makeself archive and importly passing REINSTALL_OPTIONS (not word splitting)
James Mills committed
Aug 25, 2020 at 15:25 UTC
11c610af7417ffa8903b40f940a94b4099b4eab7
2 files changed
+33
-5
build-artifacts.sh
new
+27
@@ -0,0 +1,27 @@
1
+#!/bin/sh
2
+
3
+BASENAME="netdata-$(git describe)"
4
+
5
+mkdir -p artifacts
6
+
7
+autoreconf -ivf
8
+./configure \
9
+ --prefix=/usr \
10
+ --sysconfdir=/etc \
11
+ --localstatedir=/var \
12
+ --libexecdir=/usr/libexec \
13
+ --with-zlib \
14
+ --with-math \
15
+ --with-user=netdata \
16
+ CFLAGS=-O2
17
+make dist
18
+mv "${BASENAME}.tar.gz" artifacts/
19
+
20
+USER="" ./packaging/makeself/build-x86_64-static.sh
21
+
22
+cp packaging/version artifacts/latest-version.txt
23
+
24
+cd artifacts || exit 1
25
+ln -s "${BASENAME}.tar.gz" netdata-latest.tar.gz
26
+ln -s "${BASENAME}.gz.run" netdata-latest.gz.run
27
+sha256sum -b ./* > "sha256sums.txt"
packaging/installer/netdata-updater.sh
+6
-5
@@ -131,8 +131,8 @@ set_tarball_urls() {
131
export NETDATA_TARBALL_URL="https://github.com/netdata/netdata/releases/download/$latest/netdata-$latest.${extension}"
132
export NETDATA_TARBALL_CHECKSUM_URL="https://github.com/netdata/netdata/releases/download/$latest/sha256sums.txt"
133
else
134
- export NETDATA_TARBALL_URL="$NETDATA_TARBALL_BASEURL/netdata-latest.${extension}"
135
- export NETDATA_TARBALL_CHECKSUM_URL="$NETDATA_TARBALL_BASEURL/sha256sums.txt"
134
+ export NETDATA_TARBALL_URL="$NETDATA_NIGHTLIES_BASEURL/netdata-latest.${extension}"
135
+ export NETDATA_TARBALL_CHECKSUM_URL="$NETDATA_NIGHTLIES_BASEURL/sha256sums.txt"
136
fi
137
}
138
@@ -242,8 +242,8 @@ export NETDATA_LIB_DIR="${NETDATA_LIB_DIR:-${NETDATA_PREFIX}/var/lib/netdata}"
242
# Source the tarbal checksum, if not already available from environment (for existing installations with the old logic)
243
[[ -z "${NETDATA_TARBALL_CHECKSUM}" ]] && [[ -f ${NETDATA_LIB_DIR}/netdata.tarball.checksum ]] && NETDATA_TARBALL_CHECKSUM="$(cat "${NETDATA_LIB_DIR}/netdata.tarball.checksum")"
244
245
-# Netdata Tarball Base URL (defaults to our Google Storage Bucket)
246
-[ -z "$NETDATA_TARBALL_BASEURL" ] && NETDATA_TARBALL_BASEURL=https://storage.googleapis.com/netdata-nightlies
245
+# Grab the nightlies baseurl (defaulting to our Google Storage bucket)
246
+export NETDATA_NIGHTLIES_BASEURL="${NETDATA_NIGHTLIES_BASEURL:-https://storage.googleapis.com/netdata-nightlies}"
247
248
if [ "${INSTALL_UID}" != "$(id -u)" ]; then
249
fatal "You are running this script as user with uid $(id -u). We recommend to run this script as root (user with uid 0)"
@@ -277,7 +277,8 @@ if [ "${IS_NETDATA_STATIC_BINARY}" == "yes" ]; then
277
fi
278
279
# Do not pass any options other than the accept, for now
280
- if sh "${TMPDIR}/netdata-latest.gz.run" --accept -- "${REINSTALL_OPTIONS}"; then
280
+ # shellcheck disable=SC2086
281
+ if sh "${TMPDIR}/netdata-latest.gz.run" --accept -- ${REINSTALL_OPTIONS}; then
282
rm -r "${TMPDIR}"
283
else
284
echo >&2 "NOTE: did not remove: ${TMPDIR}"