external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2025-04-10 01:17:19 +00:00
Code Issues Releases Wiki Activity

improve output formatting

Browse Source
This commit is contained in:
downtownallday 2022-04-08 06:57:16 -04:00
parent 462e628e34
commit e5ba7f8ceb
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
tests/vagrant/preloaded/prepvm.sh
View File

@ -19,6 +19,9 @@ if [ ! -d "setup" ]; then
exit 1 exit 1
fi fi
source tests/lib/system.sh
source tests/lib/color-output.sh
dry_run=true dry_run=true
@ -81,40 +84,49 @@ install_packages() {
fi fi
if [ ! -z "$pkgs" ]; then if [ ! -z "$pkgs" ]; then
echo "" H2 "install: $pkgs"
echo "======================================================="
echo "install: $pkgs"
echo "======================================================="
if ! $dry_run; then if ! $dry_run; then
apt-get install -y -qq $pkgs #apt-get install -y -qq $pkgs
exec_no_output apt-get install -y $pkgs
fi fi
fi fi
done done
} }
if ! $dry_run; then if ! $dry_run; then
apt-get update -y H1 "Upgrade system"
apt-get upgrade -y H2 "apt update"
apt-get autoremove -y exec_no_output apt-get update -y
H2 "apt upgrade"
exec_no_output apt-get upgrade -y --with-new-pkgs
H2 "apt autoremove"
exec_no_output apt-get autoremove -y
fi fi
for file in $(ls setup/*.sh); do for file in $(ls setup/*.sh); do
H1 "$file"
remove_line_continuation "$file" | install_packages remove_line_continuation "$file" | install_packages
done done
if ! $dry_run; then if ! $dry_run; then
# bonus # bonus
apt-get install -y -qq openssh-server H1 "install extras"
H2 "openssh-server"
exec_no_output apt-get install -y openssh-server
# ssh-rsa no longer a default algorithm, but still used by vagrant # ssh-rsa no longer a default algorithm, but still used by vagrant
echo "PubkeyAcceptedAlgorithms +ssh-rsa" > /etc/ssh/sshd_config.d/miabldap.conf echo "PubkeyAcceptedAlgorithms +ssh-rsa" > /etc/ssh/sshd_config.d/miabldap.conf
apt-get install -y -qq emacs-nox H2 "emacs"
apt-get install -y -qq ntpdate exec_no_output apt-get install -y emacs-nox
H2 "nptdate"
exec_no_output apt-get install -y ntpdate
# these are added by system-setup scripts and needed for test runner # these are added by system-setup scripts and needed for test runner
apt-get install -y -qq python3-dnspython jq H2 "python3-dnspython jq"
exec_no_output apt-get install -y python3-dnspython jq
# remove apache, which is what setup will do # remove apache, which is what setup will do
apt-get -y -qq purge apache2 apache2-\* H2 "remove apache2"
exec_no_output apt-get -y purge apache2 apache2-\*
echo "" echo ""
echo "" echo ""