From f7ec743fd1251bb0406eac9ddd02ac4c7483885c Mon Sep 17 00:00:00 2001
From: ray <gitea@rayelliott.dev>
Date: Fri, 4 Sep 2020 21:52:31 +0100
Subject: [PATCH] use apt-get instead of apt, use
 DEBIAN_FRONTEND=noninteractive

---
 install-local.sh                     | 1 +
 scripts/debian10/install-apache2.sh  | 3 ++-
 scripts/debian10/install-base.sh     | 3 ++-
 scripts/debian10/install-dev-base.sh | 1 +
 scripts/debian10/install-mariadb.sh  | 3 ++-
 scripts/debian10/install-mysql.sh    | 3 ++-
 scripts/debian10/install-php.sh      | 6 ++++--
 7 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/install-local.sh b/install-local.sh
index a11cc44..b6a79c8 100755
--- a/install-local.sh
+++ b/install-local.sh
@@ -24,6 +24,7 @@ done
 # update local server
 echo "Updating .."
 ssh -T $ssh << EOSSH
+	export DEBIAN_FRONTEND=noninteractive
 	apt-get update && apt-get upgrade
 EOSSH
 echo "Update complete"
diff --git a/scripts/debian10/install-apache2.sh b/scripts/debian10/install-apache2.sh
index cb2da0b..658b920 100755
--- a/scripts/debian10/install-apache2.sh
+++ b/scripts/debian10/install-apache2.sh
@@ -7,7 +7,8 @@ fi
 
 ssh -T $ssh << EOSSH
 	echo "Installing Apache2"
-	apt install -y apache2
+	export DEBIAN_FRONTEND=noninteractive
+	apt-get install -y apache2
 	ufw allow in "WWW Full"
 
 	sed -i '/export APACHE_RUN_USER=/c\export APACHE_RUN_USER='"$user" /etc/apache2/envvars
diff --git a/scripts/debian10/install-base.sh b/scripts/debian10/install-base.sh
index f0631b4..50fd9fa 100755
--- a/scripts/debian10/install-base.sh
+++ b/scripts/debian10/install-base.sh
@@ -7,7 +7,8 @@ sed -i '/PasswordAuthentication/c\PasswordAuthentication no' /etc/ssh/sshd_confi
 sed -i '/PermitRootLogin/c\PermitRootLogin prohibit-password' /etc/ssh/sshd_config
 systemctl restart sshd
 
-apt install -y ufw || (echo "ERROR while installing ufw" ; exit 15)
+export DEBIAN_FRONTEND=noninteractive
+apt-get install -y ufw || (echo "ERROR while installing ufw" ; exit 15)
 
 ufw allow ssh || (echo "Error while configuring ufw to allow ssh" ; exit 20 )
 yes | ufw enable
diff --git a/scripts/debian10/install-dev-base.sh b/scripts/debian10/install-dev-base.sh
index a973a30..84ac254 100755
--- a/scripts/debian10/install-dev-base.sh
+++ b/scripts/debian10/install-dev-base.sh
@@ -5,6 +5,7 @@ _home_dir="/home/$user"
 ssh -T $ssh << EOSSH
 
 echo "Installing packages .."
+export DEBIAN_FRONTEND=noninteractive
 apt-get -y install curl gnupg2 ninja-build gettext libtool libtool-bin autoconf automake cmake g++ pkg-config unzip python-pip python3-pip fzf vim ctags
 
 echo "Installing lazygit .."
diff --git a/scripts/debian10/install-mariadb.sh b/scripts/debian10/install-mariadb.sh
index 3fccc0c..a6f5906 100755
--- a/scripts/debian10/install-mariadb.sh
+++ b/scripts/debian10/install-mariadb.sh
@@ -14,7 +14,8 @@ ssh -T $ssh << EOSSH
 	fi
 	echo "Installing MariaDB"
 
-	apt install -y mariadb-server
+	export DEBIAN_FRONTEND=noninteractive
+	apt-get install -y mariadb-server
 
 	$_mysql_cmd "DELETE FROM mysql.user WHERE User='';"
 	$_mysql_cmd "DELETE FROM mysql.user WHERE User='root' AND Host NOT IN ('localhost', '127.0.0.1', '::1');"
diff --git a/scripts/debian10/install-mysql.sh b/scripts/debian10/install-mysql.sh
index 0e0004f..2356ec2 100755
--- a/scripts/debian10/install-mysql.sh
+++ b/scripts/debian10/install-mysql.sh
@@ -14,7 +14,8 @@ ssh -T $ssh << EOSSH
 	fi
 	echo "Installing MySQL"
 
-	apt install -y mysql-server
+	export DEBIAN_FRONTEND=noninteractive
+	apt-get install -y mysql-server
 
 	$_mysql_cmd "DELETE FROM mysql.user WHERE User='';"
 	$_mysql_cmd "DELETE FROM mysql.user WHERE User='root' AND Host NOT IN ('localhost', '127.0.0.1', '::1');"
diff --git a/scripts/debian10/install-php.sh b/scripts/debian10/install-php.sh
index e967c4a..2f8db2f 100755
--- a/scripts/debian10/install-php.sh
+++ b/scripts/debian10/install-php.sh
@@ -9,7 +9,8 @@ if [ -n "$wp_user" ] ; then
 	echo 'Installing PHP for WordPress ...'
 
 ssh -T $ssh << 'EOSSH'
-	apt install -y php libapache2-mod-php php-fpm php-bcmath php-curl php-gd php-imagick php-mbstring \
+	export DEBIAN_FRONTEND=noninteractive
+	apt-get install -y php libapache2-mod-php php-fpm php-bcmath php-curl php-gd php-imagick php-mbstring \
 		php-mysql php-soap php-xml php-zip
 
 	_php_config_file=$(php --ini | grep Loaded | awk '{ print $4 }')
@@ -23,6 +24,7 @@ else
 	echo 'Installing default PHP ...'
 
 ssh -T $ssh << EOSSH
-	apt install -y php libapache2-mod-php php-mysql
+	export DEBIAN_FRONTEND=noninteractive
+	apt-get install -y php libapache2-mod-php php-mysql
 EOSSH
 fi