From 54c707f5bbed7b1af3edb630ae45f13d79e1809a Mon Sep 17 00:00:00 2001 From: Steven Foerster Date: Sun, 19 Apr 2020 01:13:09 -0400 Subject: [PATCH] non interactive install --- installers/common.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/installers/common.sh b/installers/common.sh index ed64b16c..b478d0f2 100755 --- a/installers/common.sh +++ b/installers/common.sh @@ -99,8 +99,8 @@ function _install_dependencies() { _set_php_package if [ "$php_package" = "php7.4-cgi" ]; then echo "Adding apt-repository ppa:ondrej/php" - sudo apt-get install software-properties-common || _install_error "Unable to install dependency" - sudo add-apt-repository ppa:ondrej/php || _install_error "Unable to add-apt-repository ppa:ondrej/php" + sudo apt-get install $apt_option software-properties-common || _install_error "Unable to install dependency" + sudo add-apt-repository $apt_option ppa:ondrej/php || _install_error "Unable to add-apt-repository ppa:ondrej/php" fi if [ ${OS,,} = "debian" ] || [ ${OS,,} = "ubuntu" ]; then dhcpcd_package="dhcpcd5" @@ -247,7 +247,7 @@ function _prompt_install_openvpn() { # Install openvpn and enable client configuration option function _install_openvpn() { _install_log "Installing OpenVPN and enabling client configuration" - sudo apt-get install -y openvpn || _install_error "Unable to install openvpn" + sudo apt-get install $apt_option openvpn || _install_error "Unable to install openvpn" sudo sed -i "s/\('RASPI_OPENVPN_ENABLED', \)false/\1true/g" "$webroot_dir/includes/config.php" || _install_error "Unable to modify config.php" echo "Enabling openvpn-client service on boot" sudo systemctl enable openvpn-client@client || _install_error "Unable to enable openvpn-client daemon"