README.md

@@ -7,5 +7,5 @@ Development environment base packages:
 
 ## TODO
 
-* install-wordpress.sh - move virtual host to files/
-* quieter make?
+* add verbose options to commands
+		* install-wordpress.sh - move virtual host to files/

install-local.sh

@@ -25,7 +25,7 @@ done
 echo "Updating .."
 ssh -T $ssh << EOSSH
 	export DEBIAN_FRONTEND=noninteractive
-	apt-get -qq -y update && apt-get -qq -y upgrade
+	apt-get update && apt-get upgrade
 EOSSH
 echo "Update complete"
 

scripts/debian10/install-apache2.sh

@@ -8,9 +8,7 @@ fi
 ssh -T $ssh << EOSSH
 	echo "Installing Apache2"
 	export DEBIAN_FRONTEND=noninteractive
-	echo "Installing packages .."
-	apt-get install -qq -y apache2
-	echo "Packages installed"
+	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

scripts/debian10/install-base.sh

@@ -8,9 +8,7 @@ sed -i '/PermitRootLogin/c\PermitRootLogin prohibit-password' /etc/ssh/sshd_conf
 systemctl restart sshd
 
 export DEBIAN_FRONTEND=noninteractive
-echo "Installing packages .."
-apt-get install -qq -y ufw || (echo "ERROR while installing ufw" ; exit 15)
-echo "Packages installed"
+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

scripts/debian10/install-dev-base.sh

@@ -6,9 +6,7 @@ ssh -T $ssh << EOSSH
 
 echo "Installing packages .."
 export DEBIAN_FRONTEND=noninteractive
-echo "Installing packages .."
-apt-get -qq -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 "Packages installed"
+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 .."
 curl -fsSL https://github.com/jesseduffield/lazygit/releases/download/v0.22.1/lazygit_0.22.1_Linux_x86_64.tar.gz --output /tmp/lazygit.tar.gz
@@ -34,8 +32,7 @@ if command -v php ; then
 	php -r "unlink('composer-setup.php');"
 fi
 
-EOSSH
-ssh -T $ssh << EOSSH
+exit
 
 su "$user"
 
@@ -44,16 +41,12 @@ curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash
 echo 'export NVM_DIR="\$HOME/.nvm"' >> "$_home_dir/.profile"
 echo '[ -s "\$NVM_DIR/nvm.sh" ] && \. "\$NVM_DIR/nvm.sh"' >> "$_home_dir/.profile"
 
-EOSSH
-ssh -T $ssh << EOSSH
-
+exit
 su --login "$user"
 . ./.profile
 nvm install --lts --latest-npm
 
-EOSSH
-ssh -T $ssh << EOSSH
-
+exit
 su --login "$user"
 . ./.profile
 echo "Configuring neovim ..."
@@ -66,6 +59,8 @@ curl -fLo $_home_dir/.config/nvim/autoload/plug.vim --create-dirs \
     https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
 nvim --headless +PlugInstall +qall
 
+# TODO wakatime api key
+
 echo "Configuring lf .."
 lf config
 if [ -e "$_home_dir/.config/lf" ] ; then

scripts/debian10/install-mariadb.sh

@@ -15,9 +15,7 @@ ssh -T $ssh << EOSSH
 	echo "Installing MariaDB"
 
 	export DEBIAN_FRONTEND=noninteractive
-	echo "Installing packages .."
-	apt-get install -qq -y mariadb-server
-	echo "Packages installed"
+	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');"

scripts/debian10/install-mysql.sh

@@ -15,9 +15,7 @@ ssh -T $ssh << EOSSH
 	echo "Installing MySQL"
 
 	export DEBIAN_FRONTEND=noninteractive
-	echo "Installing packages .."
-	apt-get install -qq -y mysql-server
-	echo "Packages installed"
+	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');"

scripts/debian10/install-php.sh

@@ -10,10 +10,8 @@ if [ -n "$wp_user" ] ; then
 
 ssh -T $ssh << 'EOSSH'
 	export DEBIAN_FRONTEND=noninteractive
-	echo "Installing packages .."
-	apt-get install -qq -y php libapache2-mod-php php-fpm php-bcmath php-curl php-gd php-imagick php-mbstring \
+	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
-	echo "Packages installed"
 
 	_php_config_file=$(php --ini | grep Loaded | awk '{ print $4 }')
 	sed -i '/memory_limit/c\memory_limit = 256M' "$_php_config_file"
@@ -27,8 +25,6 @@ else
 
 ssh -T $ssh << EOSSH
 	export DEBIAN_FRONTEND=noninteractive
-	echo "Installing packages .."
-	apt-get install -qq -y php libapache2-mod-php php-mysql
-	echo "Packages installed"
+	apt-get install -y php libapache2-mod-php php-mysql
 EOSSH
 fi

scripts/debian10/install-user.sh

@@ -32,9 +32,7 @@ ssh -T $ssh << EOSSH
 
 	echo "Installing required packages .."
 	export DEBIAN_FRONTEND=noninteractive
-	echo "Installing packages .."
-	apt-get -qq -y install sudo git tmux zsh curl
-	echo "Packages installed"
+	apt-get --assume-yes install sudo git tmux zsh curl
 
 	echo "Cloning configuration files .."
 	su --login "$user"