From 174c00c3c8280c899f3a8dc9a55f6a91fc3c63f2 Mon Sep 17 00:00:00 2001
From: Christian Heller <c.heller@plomlompom.de>
Date: Sat, 19 Apr 2025 16:05:19 +0200
Subject: [PATCH] Fix.

---
 bookworm/scripts/lib/setup_user  | 4 ++--
 bookworm/scripts/setup_server.sh | 8 ++++----
 testing/scripts/setup_desktop.sh | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bookworm/scripts/lib/setup_user b/bookworm/scripts/lib/setup_user
index adadc2b..83dc001 100644
--- a/bookworm/scripts/lib/setup_user
+++ b/bookworm/scripts/lib/setup_user
@@ -1,7 +1,7 @@
 . lib/constants_user  # USERNAME
 
 setup_user() {
-    echo "\nSetting up user: ${USERNAME}"
-    adduser --stdoutmsglevel=warn --disabled-password --gecos "" "${USERNAME}"
+    echo "Setting up user: ${USERNAME}"
+    adduser --quiet --disabled-password --gecos "" "${USERNAME}"
     usermod -a -G sudo "${USERNAME}"
 }
diff --git a/bookworm/scripts/setup_server.sh b/bookworm/scripts/setup_server.sh
index 46a4eaf..9f8fd9b 100755
--- a/bookworm/scripts/setup_server.sh
+++ b/bookworm/scripts/setup_server.sh
@@ -53,7 +53,7 @@ curl -1LfsS "${PATH_CADDY_REPO}/debian.deb.txt" > "${PATH_APT_CADDY_REPO}"
 init_packages "${INSTALL_TAGS}"
 setup_user
 
-echo '\nCopying over files, directories …'
+echo 'Copying over files, directories …'
 copy_dirtrees_of_tags ${INSTALL_TAGS}
 
 echo 'Setting hostname …' 
@@ -75,12 +75,12 @@ mv "/root/${PATH_REL_SSH}/authorized_keys" "${PATH_USER_SSH}/"
 chown -R "${USERNAME}:${USERNAME}" "${PATH_USER_SSH}"
 
 echo 'Setting up minimal borg user …'
-adduser --stdoutmsglevel=warn --system --home "${PATH_BORG_HOME}" --shell /bin/sh borg
+adduser --quiet --system --home "${PATH_BORG_HOME}" --shell /bin/sh borg
 cp -a "${PATH_USER_SSH}" "${PATH_BORG_HOME}/"
 chown -R borg:nogroup "${PATH_BORG_HOME}/${PATH_REL_SSH}"
 
 echo 'Enabling firewall …'
-systemctl enable --now nftables
+systemctl --quiet enable --now nftables
 
 echo "Creating web-accessible directories …"
 mkdir -p /var/www/dump/private /var/www/dump/public
@@ -92,7 +92,7 @@ if [ -z "${FQDN}" ]; then
 else
     ADDRESS_TO_CADDY="${FQDN}"
 fi
-sed -i 's/REPLACE_WITH_HASH/'"${CADDY_PW_HASH}"'/g' "${PATH_CADDYFILE}"
+sed -i 's|REPLACE_WITH_HASH|'"${CADDY_PW_HASH}"'|g' "${PATH_CADDYFILE}"
 sed -i 's/REPLACE_WITH_FQDN/'"${ADDRESS_TO_CADDY}"'/g' "${PATH_CADDYFILE}"
 
 echo "Restarting caddy …"
diff --git a/testing/scripts/setup_desktop.sh b/testing/scripts/setup_desktop.sh
index e1ad5c8..93b3a6b 100755
--- a/testing/scripts/setup_desktop.sh
+++ b/testing/scripts/setup_desktop.sh
@@ -105,10 +105,10 @@ echo "\nEnsuring our desired locale is available."
 locale-gen
 
 echo '\nSyncing clock.'
-ntpdate-debian
+ntpdate-debian -s
 
 echo '\nFinal user setup.'
-adduser plom plugdev  # so user may use pmount
+adduser --quiet plom plugdev  # so user may use pmount
 passwd "${USERNAME}"
 
 put_finished_marker 'setup_desktop'
-- 
2.30.2