diff options
| author | Austin S. Hemmelgarn <austin@netdata.cloud> | 2020-04-13 08:39:52 -0400 |
|---|---|---|
| committer | Austin S. Hemmelgarn <austin@netdata.cloud> | 2020-04-13 08:42:22 -0400 |
| commit | e2874320fc027f7ab51ab3e115d5b1889b8fd747 (patch) | |
| tree | cd755ef9b8522634c61aed9888239c9b67394157 /packaging/installer | |
| parent | 353780082c0ac8525e5b52aa8a29bbf5b70871e8 (diff) | |
Revert changes since v1.21 in pereparation for hotfix release.
Diffstat (limited to 'packaging/installer')
| -rwxr-xr-x | packaging/installer/install-required-packages.sh | 6 | ||||
| -rw-r--r-- | packaging/installer/methods/macos.md | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/packaging/installer/install-required-packages.sh b/packaging/installer/install-required-packages.sh index 26a17192e1..ae07e6642f 100755 --- a/packaging/installer/install-required-packages.sh +++ b/packaging/installer/install-required-packages.sh @@ -192,7 +192,7 @@ get_os_release() { eval "$(grep -E "^(NAME|ID|ID_LIKE|VERSION|VERSION_ID)=" "${os_release_file}")" for x in "${ID}" ${ID_LIKE}; do case "${x,,}" in - alpine | arch | centos | clear-linux-os | debian | fedora | gentoo | manjaro | opensuse-leap | rhel | sabayon | sles | suse | ubuntu) + alpine | arch | centos | debian | fedora | gentoo | sabayon | rhel | ubuntu | suse | opensuse-leap | sles | clear-linux-os) distribution="${x}" version="${VERSION_ID}" codename="${VERSION}" @@ -1047,9 +1047,7 @@ declare -A pkg_zip=( ) validate_package_trees() { - if type -t validate_tree_${tree} > /dev/null; then - validate_tree_${tree} - fi + validate_tree_${tree} } validate_installed_package() { diff --git a/packaging/installer/methods/macos.md b/packaging/installer/methods/macos.md index d51ffccf23..337e1ef596 100644 --- a/packaging/installer/methods/macos.md +++ b/packaging/installer/methods/macos.md @@ -75,7 +75,7 @@ sudo ./netdata-installer.sh --install /usr/local > Your Netdata configuration directory will be at `/usr/local/netdata/`, and your stock configuration directory will > be at **`/usr/local/lib/netdata/conf.d/`.** > -> The installer will also install a startup plist to start Netdata when your macOS system boots. +> The installer will also install a startup plist to start Netdata when your Mac boots. ## What's next? |