From d026486ce39d02f1e282024b397581b18f327135 Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Thu, 19 Sep 2024 09:17:28 +0200 Subject: [fix] scripts: elimination of limitations on dedicated distributions The restriction of shell scripts to certain distributions is only required for certain actions such as the installation of a SearXNG instance. The maintenance scripts and build processes were previously also restricted to these specific distributions. With this patch, the build processes (such as the build of online documentation) can now also be executed on all Linux distributions. Signed-off-by: Markus Heiser --- utils/lib.sh | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) (limited to 'utils/lib.sh') diff --git a/utils/lib.sh b/utils/lib.sh index b932b875c..7e80b12f1 100755 --- a/utils/lib.sh +++ b/utils/lib.sh @@ -958,7 +958,6 @@ nginx_distro_setup() { ;; esac } -nginx_distro_setup install_nginx(){ info_msg "installing nginx ..." @@ -1127,8 +1126,6 @@ apache_distro_setup() { esac } -apache_distro_setup - install_apache(){ info_msg "installing apache ..." pkg_install "$APACHE_PACKAGES" @@ -1291,8 +1288,6 @@ uWSGI_distro_setup() { esac } -uWSGI_distro_setup - install_uwsgi(){ info_msg "installing uwsgi ..." pkg_install "$uWSGI_PACKAGES" @@ -1685,13 +1680,15 @@ LXC_BASE_PACKAGES_fedora="bash git @development-tools python" # yum packages LXC_BASE_PACKAGES_centos="bash git python3" -case $DIST_ID in - ubuntu|debian) LXC_BASE_PACKAGES="${LXC_BASE_PACKAGES_debian}" ;; - arch) LXC_BASE_PACKAGES="${LXC_BASE_PACKAGES_arch}" ;; - fedora) LXC_BASE_PACKAGES="${LXC_BASE_PACKAGES_fedora}" ;; - centos) LXC_BASE_PACKAGES="${LXC_BASE_PACKAGES_centos}" ;; - *) err_msg "$DIST_ID-$DIST_VERS: pkg_install LXC_BASE_PACKAGES not yet implemented" ;; -esac +lxc_distro_setup() { + case $DIST_ID in + ubuntu|debian) LXC_BASE_PACKAGES="${LXC_BASE_PACKAGES_debian}" ;; + arch) LXC_BASE_PACKAGES="${LXC_BASE_PACKAGES_arch}" ;; + fedora) LXC_BASE_PACKAGES="${LXC_BASE_PACKAGES_fedora}" ;; + centos) LXC_BASE_PACKAGES="${LXC_BASE_PACKAGES_centos}" ;; + *) err_msg "$DIST_ID-$DIST_VERS: pkg_install LXC_BASE_PACKAGES not yet implemented" ;; + esac +} lxc_install_base_packages() { info_msg "install LXC_BASE_PACKAGES in container $1" -- cgit v1.2.3