diff options
Diffstat (limited to 'packaging/makeself/install-or-update.sh')
-rwxr-xr-x | packaging/makeself/install-or-update.sh | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/packaging/makeself/install-or-update.sh b/packaging/makeself/install-or-update.sh index 13d178d31..6a4cd5b97 100755 --- a/packaging/makeself/install-or-update.sh +++ b/packaging/makeself/install-or-update.sh @@ -26,7 +26,6 @@ if [ -d /opt/netdata/etc/netdata.old ]; then fi STARTIT=1 -AUTOUPDATE=0 REINSTALL_OPTIONS="" RELEASE_CHANNEL="nightly" # check .travis/create_artifacts.sh before modifying @@ -36,10 +35,7 @@ while [ "${1}" ]; do STARTIT=0 REINSTALL_OPTIONS="${REINSTALL_OPTIONS} ${1}" ;; - "--auto-update" | "-u") - AUTOUPDATE=1 - REINSTALL_OPTIONS="${REINSTALL_OPTIONS} ${1}" - ;; + "--auto-update" | "-u") ;; "--stable-channel") RELEASE_CHANNEL="stable" REINSTALL_OPTIONS="${REINSTALL_OPTIONS} ${1}" @@ -58,7 +54,10 @@ while [ "${1}" ]; do shift 1 done -if [ ! "${DO_NOT_TRACK:-0}" -eq 0 ] || [ -n "$DO_NOT_TRACK" ]; then +if [ ! "${DISABLE_TELEMETRY:-0}" -eq 0 ] || + [ -n "$DISABLE_TELEMETRY" ] || + [ ! "${DO_NOT_TRACK:-0}" -eq 0 ] || + [ -n "$DO_NOT_TRACK" ]; then NETDATA_DISABLE_TELEMETRY=1 REINSTALL_OPTIONS="${REINSTALL_OPTIONS} --disable-telemetry" fi @@ -158,13 +157,6 @@ progress "Install (but not enable) netdata updater tool" cleanup_old_netdata_updater || run_failed "Cannot cleanup old netdata updater tool." install_netdata_updater || run_failed "Cannot install netdata updater tool." -progress "Check if we must enable/disable the netdata updater tool" -if [ "${AUTOUPDATE}" = "1" ]; then - enable_netdata_updater || run_failed "Cannot enable netdata updater tool" -else - disable_netdata_updater || run_failed "Cannot disable netdata updater tool" -fi - # ----------------------------------------------------------------------------- progress "creating quick links" |