summaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2022-06-10 17:49:16 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2022-06-10 17:49:16 +0000
commit68268800d498023aecbba19b47cddd618e233fc3 (patch)
tree2557f39b64809f76fb1a7e893427d59868052030 /packaging
parentReleasing debian version 1.35.0-1. (diff)
downloadnetdata-68268800d498023aecbba19b47cddd618e233fc3.tar.xz
netdata-68268800d498023aecbba19b47cddd618e233fc3.zip
Merging upstream version 1.35.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r--packaging/installer/functions.sh29
-rwxr-xr-xpackaging/makeself/install-or-update.sh1
-rw-r--r--packaging/version2
3 files changed, 1 insertions, 31 deletions
diff --git a/packaging/installer/functions.sh b/packaging/installer/functions.sh
index fe2fed78..8bf7fafc 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 6a4cd5b9..15b073fe 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."
# -----------------------------------------------------------------------------
diff --git a/packaging/version b/packaging/version
index 099485f4..e8d43fec 100644
--- a/packaging/version
+++ b/packaging/version
@@ -1 +1 @@
-v1.35.0
+v1.35.1