diff options
| author | Ilya Mashchenko <ilya@netdata.cloud> | 2020-04-06 15:45:08 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-06 15:45:08 +0300 |
| commit | 582d98780d68288821ed63f5b1ff3464095d9190 (patch) | |
| tree | 0f4b1dd52e1a1045d0e76a533bcd76de58ffaa97 /packaging/installer | |
| parent | fe2273567a56d22a551c0becd3fef16696e87e8c (diff) | |
packaging: fix errors during install-requred-packages (#8606)
* packaging: update install-requred-packages.sh: add `manjaro` to the list of known OSes of get_os_release func and sort the list alphabetically
* packaging: fix `validate_package_trees` func exists before executing it
Diffstat (limited to 'packaging/installer')
| -rwxr-xr-x | packaging/installer/install-required-packages.sh | 6 |
1 files changed, 4 insertions, 2 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() { |