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
Ilya Mashchenko committed
Apr 6, 2020 at 15:45 UTC
582d98780d68288821ed63f5b1ff3464095d9190
1 file changed
+4
-2
packaging/installer/install-required-packages.sh
+4
-2
@@ -192,7 +192,7 @@ get_os_release() {
192
eval "$(grep -E "^(NAME|ID|ID_LIKE|VERSION|VERSION_ID)=" "${os_release_file}")"
193
for x in "${ID}" ${ID_LIKE}; do
194
case "${x,,}" in
195
- alpine | arch | centos | debian | fedora | gentoo | sabayon | rhel | ubuntu | suse | opensuse-leap | sles | clear-linux-os)
195
+ alpine | arch | centos | clear-linux-os | debian | fedora | gentoo | manjaro | opensuse-leap | rhel | sabayon | sles | suse | ubuntu)
196
distribution="${x}"
197
version="${VERSION_ID}"
198
codename="${VERSION}"
@@ -1047,7 +1047,9 @@ declare -A pkg_zip=(
1047
)
1048
1049
validate_package_trees() {
1050
- validate_tree_${tree}
1050
+ if type -t validate_tree_${tree} > /dev/null; then
1051
+ validate_tree_${tree}
1052
+ fi
1053
}
1054
1055
validate_installed_package() {