From 907104021dbd4bbb1081647bd90a03a884e45a8e Mon Sep 17 00:00:00 2001
From: Christian Heller <c.heller@plomlompom.de>
Date: Wed, 16 Apr 2025 02:34:38 +0200
Subject: [PATCH] Fix.

---
 bookworm/aptmark/all                         | 2 ++
 bookworm/scripts/lib/ensure_packages_of_tags | 2 +-
 bookworm/scripts/lib/init_packages           | 4 ++--
 bookworm/scripts/setup_server.sh             | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/bookworm/aptmark/all b/bookworm/aptmark/all
index 3605a65..68791c8 100644
--- a/bookworm/aptmark/all
+++ b/bookworm/aptmark/all
@@ -11,4 +11,6 @@ netcat-traditional
 iputils-ping
 # to set the time
 ntpsec-ntpdate
+# generally used in my scripts, so necessary
+calc
 #
diff --git a/bookworm/scripts/lib/ensure_packages_of_tags b/bookworm/scripts/lib/ensure_packages_of_tags
index e1fdb98..45859d0 100644
--- a/bookworm/scripts/lib/ensure_packages_of_tags
+++ b/bookworm/scripts/lib/ensure_packages_of_tags
@@ -8,7 +8,7 @@ ensure_packages_of_tags() {
         fi
         cat "${_PATH_APTMARK_TAG}" | while read _LINE; do
             if [ ! $(echo "${_LINE}" | cut -c1) = "#" ]; then
-                apt-get -y -o Dpkg::Options::="--force-confnew" install "${_LINE}"
+                apt-get -y -o Dpkg::Options::="--force-confnew" install "${_LINE}" > /dev/null
             fi
         done
     done
diff --git a/bookworm/scripts/lib/init_packages b/bookworm/scripts/lib/init_packages
index 0de0578..f84f5b6 100644
--- a/bookworm/scripts/lib/init_packages
+++ b/bookworm/scripts/lib/init_packages
@@ -21,6 +21,6 @@ init_packages() {
 
     # before purging, ensure tagged packages installed
     ensure_packages_of_tags $@ 
-    apt -y --purge autoremove
-    apt -y dist-upgrade
+    apt -y --purge autoremove > /dev/null
+    apt -y dist-upgrade > /dev/null
 }
diff --git a/bookworm/scripts/setup_server.sh b/bookworm/scripts/setup_server.sh
index f1a1fb3..c459f89 100755
--- a/bookworm/scripts/setup_server.sh
+++ b/bookworm/scripts/setup_server.sh
@@ -22,7 +22,7 @@ PATH_CADDYFILE="${PATH_ETC}/caddy/Caddyfile"
 
 echo '\nPreparing caddy install.'
 PATH_CADDY_REPO='https://dl.cloudsmith.io/public/caddy/stable'
-apt -y install curl
+apt -y install curl > /dev/null
 curl -1Lf "${PATH_CADDY_REPO}/gpg.key" | gpg --dearmor -o /usr/share/keyrings/caddy-stable-archive-keyring.gpg
 curl -1Lf "${PATH_CADDY_REPO}/debian.deb.txt" | tee /etc/apt/sources.list.d/caddy-stable.list
 
-- 
2.30.2