diff options
| author | James Mills <prologic@shortcircuit.net.au> | 2020-05-07 03:34:36 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-07 03:34:36 +1000 |
| commit | 935eb39007f7ea3726df46907c5e1d953958e395 (patch) | |
| tree | f2366df1c766dd89b91521010b90674f5b70f098 /packaging/installer | |
| parent | b07904f779273d525d9a1810b6159bb762d5c877 (diff) | |
Fix missing NETDATA_STOP_CMD in netdata-installer.sh (#8897)
* Fix missing NETDATA_STOP_CMD in netdata-installer.sh
* Fix shellcheck warnings
* Fix more shellcheck warnings
Diffstat (limited to 'packaging/installer')
| -rw-r--r-- | packaging/installer/functions.sh | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/packaging/installer/functions.sh b/packaging/installer/functions.sh index ea2670c00c..8680b3f4c5 100644 --- a/packaging/installer/functions.sh +++ b/packaging/installer/functions.sh @@ -400,6 +400,10 @@ install_non_systemd_init() { return 1 } +# This is used by netdata-installer.sh +# shellcheck disable=SC2034 +NETDATA_STOP_CMD="netdatacli shutdown-agent" + NETDATA_START_CMD="netdata" NETDATA_INSTALLER_START_CMD="" @@ -425,14 +429,20 @@ install_netdata_service() { return 0 else echo >&2 "Installing MacOS X plist file..." + # This is used by netdata-installer.sh + # shellcheck disable=SC2034 run cp system/netdata.plist /Library/LaunchDaemons/com.github.netdata.plist && run launchctl load /Library/LaunchDaemons/com.github.netdata.plist && - return 0 + NETDATA_START_CMD="launchctl start com.github.netdata" && + NETDATA_STOP_CMD="launchctl stop com.github.netdata" + return 0 fi elif [ "${uname}" = "FreeBSD" ]; then - + # This is used by netdata-installer.sh + # shellcheck disable=SC2034 run cp system/netdata-freebsd /etc/rc.d/netdata && NETDATA_START_CMD="service netdata start" && + NETDATA_STOP_CMD="service netdata stop" && NETDATA_INSTALLER_START_CMD="service netdata onestart" && myret=$? @@ -444,6 +454,9 @@ install_netdata_service() { elif issystemd; then # systemd is running on this system NETDATA_START_CMD="systemctl start netdata" + # This is used by netdata-installer.sh + # shellcheck disable=SC2034 + NETDATA_STOP_CMD="systemctl stop netdata" NETDATA_INSTALLER_START_CMD="${NETDATA_START_CMD}" SYSTEMD_DIRECTORY="" @@ -483,8 +496,14 @@ install_netdata_service() { if [ ${ret} -eq 0 ]; then if [ -n "${service_cmd}" ]; then NETDATA_START_CMD="service netdata start" + # This is used by netdata-installer.sh + # shellcheck disable=SC2034 + NETDATA_STOP_CMD="service netdata stop" elif [ -n "${rcservice_cmd}" ]; then NETDATA_START_CMD="rc-service netdata start" + # This is used by netdata-installer.sh + # shellcheck disable=SC2034 + NETDATA_STOP_CMD="rc-service netdata stop" fi NETDATA_INSTALLER_START_CMD="${NETDATA_START_CMD}" fi |