Assorted updater fixes. (#10613)
* Fix option name in updater re-invocation code. * Fix handling of a pre-set temporary directory. * Properly pass temporary directory from updater to installer.
Austin S. Hemmelgarn committed
Mar 23, 2021 at 13:16 UTC
e5aa543cac723a039ff98b0dc238c861f7807b33
1 file changed
+5
-3
packaging/installer/netdata-updater.sh
+5
-3
@@ -116,7 +116,7 @@ _cannot_use_tmpdir() {
116
117
create_tmp_directory() {
118
if [ -n "${NETDATA_TMPDIR_PATH}" ]; then
119
- TMPDIR="${NETDATA_TMPDIR_PATH}"
119
+ echo "${NETDATA_TMPDIR_PATH}"
120
else
121
if [ -z "${NETDATA_TMPDIR}" ] || _cannot_use_tmpdir "${NETDATA_TMPDIR}" ; then
122
if [ -z "${TMPDIR}" ] || _cannot_use_tmpdir "${TMPDIR}" ; then
@@ -204,7 +204,7 @@ self_update() {
204
if _safe_download "https://raw.githubusercontent.com/netdata/netdata/master/packaging/installer/netdata-updater.sh" ./netdata-updater.sh; then
205
chmod +x ./netdata-updater.sh || exit 1
206
export ENVIRONMENT_FILE="${ENVIRONMENT_FILE}"
207
- exec ./netdata-updater.sh --not-running-from-cron --no-self-update --tmpdir-path "$(pwd)"
207
+ exec ./netdata-updater.sh --not-running-from-cron --no-updater-self-update --tmpdir-path "$(pwd)"
208
else
209
echo >&3 "Failed to download newest version of updater script, continuing with current version."
210
fi
@@ -314,8 +314,10 @@ update() {
314
do_not_start="--dont-start-it"
315
fi
316
317
+ env="TMPDIR='${TMPDIR}'"
318
+
319
if [ -n "${NETDATA_SELECTED_DASHBOARD}" ]; then
318
- env="NETDATA_SELECTED_DASHBOARD=${NETDATA_SELECTED_DASHBOARD}"
320
+ env="${env} NETDATA_SELECTED_DASHBOARD=${NETDATA_SELECTED_DASHBOARD}"
321
fi
322
323
if [ ! -x ./netdata-installer.sh ]; then