Improve verbosity.

diff --git a/testing/scripts/setup_desktop.sh b/testing/scripts/setup_desktop.sh
index c1ea38429880d7b1d62be8ceb36b52b3e25a2605..d6cda3b0f8d536fd12fa4e8bb71785027c5f2178 100755 (executable)
--- a/testing/scripts/setup_desktop.sh
+++ b/testing/scripts/setup_desktop.sh
@@ -1,6 +1,5 @@
 #!/bin/sh
 set -e
-set -x
 . ./_misc.sh
 
 expect_min_n_args 1 "(system name)" "$@"
@@ -8,7 +7,7 @@ abort_if_offline
 get_system_name_arg "$1"
 MIN_MODULES="all ${SYSTEM_CLASS_NAME} ${SYSTEM_NAME}"
 
-echo "Upgrading to testing."
+echo "\nUpgrading to testing."
 # For this step only very selectively prepare /etc/ files.
 PATH_REL_APT=apt
 PATH_REL_APT_CONF=${PATH_REL_APT}/apt.conf.d
@@ -24,7 +23,7 @@ apt -y -o Dpkg::Options::='--force-confnew' upgrade
 apt -y -o Dpkg::Options::='--force-confnew' full-upgrade
 apt -y autoremove
 
-echo "Setting hostname and FQDN."
+echo "\nSetting hostname and FQDN."
 echo "${SYSTEM_NAME}" > /etc/hostname
 hostname "${SYSTEM_NAME}"
 final_ip="127.0.1.1"
@@ -52,7 +51,7 @@ done
 echo "127.0.0.1 localhost.localdomain localhost" > /etc/hosts
 echo "${final_ip} ${SYSTEM_NAME}" >> /etc/hosts
 
-echo "Installing and/or keeping only what's required by us or Debian."
+echo "\nInstalling and/or keeping only what's required by us or Debian."
 # Ensure package installation state as defined by what packages are
 # defined as required by Debian policy and by settings in ./apt-mark/.
 mark_nonrequireds_auto
@@ -65,7 +64,7 @@ for root in $ROOTS_HERE_AND_MANY; do
 done
 apt -y --purge autoremove
 
-echo "Checking for existing wifi config in ${PATH_NETWORK_INTERFACES}."
+echo "\nChecking for existing wifi config in ${PATH_NETWORK_INTERFACES}."
 # NB: This needs to come before steps potentially overwriting /etc/network/interfaces.
 PATH_NETWORK_INTERFACES=/etc/network/interfaces
 get_network_interfaces_last_wpa_value() {
@@ -83,24 +82,24 @@ if [ ! -z "${WLAN_SSID}" ]; then
     fi
 fi
 
-echo "Adapting /etc to our needs."
+echo "\nAdapting /etc to our needs."
 for root in $ROOTS_HERE_AND_MANY; do
     copy_dirtree "${root}/${PATH_REL_ETC}" '/etc' ${MIN_MODULES} user desktop
 done
 
-echo "Ensuring our desired locale is available."
+echo "\nEnsuring our desired locale is available."
 locale-gen
 
-echo "Setting Berlin localtime."
+echo "\nSetting Berlin localtime."
 ln -sf /usr/share/zoneinfo/Europe/Berlin /etc/localtime
 ntpdate-debian
 
-echo "Setting up root user's home directory."
+echo "\nSetting up root user's home directory."
 for root in $ROOTS_HERE_AND_MANY; do
     copy_dirtree "${root}/${PATH_REL_HOME}" '/root' ${MIN_MODULES} minimal root
 done
 
-echo "Setting up user ${USERNAME}."
+echo "\nSetting up user ${USERNAME}."
 adduser --disabled-password --gecos "" "${USERNAME}"
 usermod -a -G sudo "${USERNAME}"
 for root in $ROOTS_HERE_AND_MANY; do

diff --git a/testing/scripts/setup_secrets_user.sh b/testing/scripts/setup_secrets_user.sh
index 4ef27285d4ffdec7896e151d512c4d00ee673ec2..a5c547fe03a9d5b2d27fcb8ee9c190920ed13481 100755 (executable)
--- a/testing/scripts/setup_secrets_user.sh
+++ b/testing/scripts/setup_secrets_user.sh
@@ -41,7 +41,7 @@ ssh ${REPOS_SITE_LOGIN} "cd $REMOTE_PATH_REPOS && ls -1" | while read REPO_NAME;
     git clone --recurse "${REPOS_SITE_LOGIN}:${REMOTE_PATH_REPOS}/${REPO_NAME}"
 done
 
-echo "\nSet up borg and pull in ~/org"
+echo "\nSetting up borg and pull in ~/org"
 PATH_TARED_KEYS=borg_keyfiles
 mkdir -p "${PATH_BORGKEYS}"
 tar xf "${PATH_SECRETS}/${PATH_TARED_KEYS}.tar"