frodovdr/raspap-webgui
1
0
Fork 0
mirror of https://github.com/billz/raspap-webgui.git synced 2023-10-10 13:37:24 +02:00
Code Issues Releases Wiki Activity

Tidy function w/ do loop

Browse Source
This commit is contained in:
billz 2022-06-07 20:46:55 +01:00
parent a75ead776f
commit fcd3a7f204
1 changed files with 20 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
installers/common.sh
View File

@ -163,45 +163,30 @@ function _set_php_package() {
# On Ubuntu 20.04 / Armbian 22, the systemd-resolved service uses port 53 # On Ubuntu 20.04 / Armbian 22, the systemd-resolved service uses port 53
# by default which prevents dnsmasq from starting. # by default which prevents dnsmasq from starting.
function _manage_systemd_services() { function _manage_systemd_services() {
_install_log "Checking for systemd-networkd services" _install_log "Checking for systemd network services"
# Prompt to disable systemd-networkd service services=( "systemd-networkd" "systemd-resolved" )
if systemctl is-active --quiet systemd-networkd.service; then for svc in "${services[@]}"; do
echo -n "Stop and disable systemd-networkd service? [Y/n]: " # Prompt to disable systemd service
if [ "$assume_yes" == 0 ]; then if systemctl is-active --quiet "$svc".service; then
read answer < /dev/tty echo -n "Stop and disable ${svc} service? [Y/n]: "
if [ "$answer" != "${answer#[Nn]}" ]; then if [ "$assume_yes" == 0 ]; then
echo -e read answer < /dev/tty
if [ "$answer" != "${answer#[Nn]}" ]; then
echo -e
else
sudo systemctl stop "$svc".service
sudo systemctl disable "$svc".service
fi
else else
sudo systemctl stop systemd-networkd.service sudo systemctl stop "$svc".service
sudo systemctl disable systemd-networkd.service sudo systemctl disable "$svc".service
fi fi
else else
sudo systemctl stop systemd-networkd.service echo "${svc}.service is not running (OK)"
sudo systemctl disable systemd-networkd.service
fi fi
else done
echo "systemd-networkd.service is not running (OK)" _install_status 0
fi
# Prompt to disable systemd-resolved service
if systemctl is-active --quiet systemd-resolved.service; then
echo -n "Stop and disable systemd-resolved service? [Y/n]: "
if [ "$assume_yes" == 0 ]; then
read answer < /dev/tty
if [ "$answer" != "${answer#[Nn]}" ]; then
echo -e
else
sudo systemctl stop systemd-resolved.service
sudo systemctl disable systemd-resolved.service
fi
else
sudo systemctl stop systemd-resolved.service
sudo systemctl disable systemd-resolved.service
fi
else
echo "systemd-resolved.service is not running (OK)"
fi
} }
# Runs a system software update to make sure we're using all fresh packages # Runs a system software update to make sure we're using all fresh packages
@ -213,7 +198,7 @@ function _install_dependencies() {
sudo apt-get install $apt_option software-properties-common || _install_status 1 "Unable to install dependency" sudo apt-get install $apt_option software-properties-common || _install_status 1 "Unable to install dependency"
sudo add-apt-repository $apt_option ppa:ondrej/php || _install_status 1 "Unable to add-apt-repository ppa:ondrej/php" sudo add-apt-repository $apt_option ppa:ondrej/php || _install_status 1 "Unable to add-apt-repository ppa:ondrej/php"
else else
echo "PHP will be installed from the main deb sources list" echo "${php_package} will be installed from the main deb sources list"
fi fi
if [ ${OS,,} = "debian" ] || [ ${OS,,} = "ubuntu" ]; then if [ ${OS,,} = "debian" ] || [ ${OS,,} = "ubuntu" ]; then
dhcpcd_package="dhcpcd5" dhcpcd_package="dhcpcd5"