diff options
| author | Austin S. Hemmelgarn <austin@netdata.cloud> | 2020-04-13 10:32:33 -0400 |
|---|---|---|
| committer | Austin S. Hemmelgarn <austin@netdata.cloud> | 2020-04-13 10:32:33 -0400 |
| commit | 983a26d1a2c110b35db252b4b79c3f03eb4eeb4b (patch) | |
| tree | 85d42c30bc81514bd5c18aa564497e439290523b /packaging/installer | |
| parent | 5a12b4a7e42587058b9b42871a1316545d527a57 (diff) | |
Revert "Revert changes since v1.21 in pereparation for hotfix release."
This reverts commit e2874320fc027f7ab51ab3e115d5b1889b8fd747.
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, 5 insertions, 3 deletions
diff --git a/packaging/installer/install-required-packages.sh b/packaging/installer/install-required-packages.sh index ae07e6642f..26a17192e1 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 | debian | fedora | gentoo | sabayon | rhel | ubuntu | suse | opensuse-leap | sles | clear-linux-os) + alpine | arch | centos | clear-linux-os | debian | fedora | gentoo | manjaro | opensuse-leap | rhel | sabayon | sles | suse | ubuntu) distribution="${x}" version="${VERSION_ID}" codename="${VERSION}" @@ -1047,7 +1047,9 @@ declare -A pkg_zip=( ) validate_package_trees() { - validate_tree_${tree} + if type -t validate_tree_${tree} > /dev/null; then + validate_tree_${tree} + fi } validate_installed_package() { diff --git a/packaging/installer/methods/macos.md b/packaging/installer/methods/macos.md index 337e1ef596..d51ffccf23 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 Mac boots. +> The installer will also install a startup plist to start Netdata when your macOS system boots. ## What's next? |