diff options
| author | Austin S. Hemmelgarn <austin@netdata.cloud> | 2022-06-09 13:56:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-09 13:56:22 -0400 |
| commit | 4ff9958519458506c3d70da2697bdf5d394061a9 (patch) | |
| tree | 1024ae4ead66ab1bc88d2151f2a0a216766f3702 /packaging | |
| parent | b67c1026bae0411e863a227214fd4175ff109d0f (diff) | |
Remove unnescesary ‘cleanup’ code. (#13103)
This was causing the updter to be unconditionally disabled on static
builds, and we don’t actually _need_ any of it anymore since we’ve
already decoupled the auto-update handling state from the installation
process (in fact, this should have been removed then, but it got missed
somehow).
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/installer/functions.sh | 29 | ||||
| -rwxr-xr-x | packaging/makeself/install-or-update.sh | 1 |
2 files changed, 0 insertions, 30 deletions
diff --git a/packaging/installer/functions.sh b/packaging/installer/functions.sh index fe2fed7816..8bf7fafcfa 100644 --- a/packaging/installer/functions.sh +++ b/packaging/installer/functions.sh @@ -981,35 +981,6 @@ install_netdata_updater() { return 0 } -cleanup_old_netdata_updater() { - if [ -f "${NETDATA_PREFIX}"/usr/libexec/netdata-updater.sh ]; then - echo >&2 "Removing updater from deprecated location" - rm -f "${NETDATA_PREFIX}"/usr/libexec/netdata-updater.sh - fi - - if issystemd && [ -n "$(get_systemd_service_dir)" ] ; then - systemctl disable netdata-updater.timer - rm -f "$(get_systemd_service_dir)/netdata-updater.timer" - rm -f "$(get_systemd_service_dir)/netdata-updater.service" - fi - - if [ -d /etc/cron.daily ]; then - rm -f /etc/cron.daily/netdata-updater.sh - rm -f /etc/cron.daily/netdata-updater - fi - - if [ -d /etc/periodic/daily ]; then - rm -f /etc/periodic/daily/netdata-updater.sh - rm -f /etc/periodic/daily/netdata-updater - fi - - if [ -d /etc/cron.d ]; then - rm -f /etc/cron.d/netdata-updater - fi - - return 0 -} - set_netdata_updater_channel() { sed -i -e "s/^RELEASE_CHANNEL=.*/RELEASE_CHANNEL=\"${RELEASE_CHANNEL}\"/" "${NETDATA_USER_CONFIG_DIR}/.environment" } diff --git a/packaging/makeself/install-or-update.sh b/packaging/makeself/install-or-update.sh index 6a4cd5b971..15b073febd 100755 --- a/packaging/makeself/install-or-update.sh +++ b/packaging/makeself/install-or-update.sh @@ -154,7 +154,6 @@ set_netdata_updater_channel || run_failed "Cannot set netdata updater tool relea # ----------------------------------------------------------------------------- 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." # ----------------------------------------------------------------------------- |