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

---
 bookworm/scripts/lib/apt_get_edited          |  3 ++-
 bookworm/scripts/lib/core_setup              |  3 +--
 bookworm/scripts/lib/ensure_packages_of_tags | 18 +++++++++---------
 trixie/scripts/from_older_upgrade.sh         |  3 ++-
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/bookworm/scripts/lib/apt_get_edited b/bookworm/scripts/lib/apt_get_edited
index 002056f..de1d7b2 100644
--- a/bookworm/scripts/lib/apt_get_edited
+++ b/bookworm/scripts/lib/apt_get_edited
@@ -21,7 +21,8 @@ _PREFIXES=\
 4 2 0 Removing
 5 5 1 Selecting previously unselected package
 5 3 0 Setting up
-11 8 1 dpkg: warning: unable to delete old directory'
+11 8 1 dpkg: warning: unable to delete old directory
+5 3-5 1 Created symlink'
 
 _LAST_PREFIX=''
 DEBIAN_FRONTEND=noninteractive apt-get -y $1 2>&1 | while read _LINE; do
diff --git a/bookworm/scripts/lib/core_setup b/bookworm/scripts/lib/core_setup
index 2a8eda1..b9df306 100644
--- a/bookworm/scripts/lib/core_setup
+++ b/bookworm/scripts/lib/core_setup
@@ -42,8 +42,7 @@ core_setup() {
     copy_dirtrees_of_tags ${_INSTALL_TAGS}
     
     echo '# Setting hostname …' 
-    echo "${_HOSTNAME}" > "${PATH_ETC}/hostname"
-    hostname "${_HOSTNAME}"
+    hostnamectl hostname "${_HOSTNAME}"
 
     echo "# Adapting ${_PATH_HOSTS} …"
     _PATH_HOSTS="${PATH_ETC}/hosts"
diff --git a/bookworm/scripts/lib/ensure_packages_of_tags b/bookworm/scripts/lib/ensure_packages_of_tags
index a3c0165..124494b 100644
--- a/bookworm/scripts/lib/ensure_packages_of_tags
+++ b/bookworm/scripts/lib/ensure_packages_of_tags
@@ -1,3 +1,5 @@
+lib/apt_get_edited
+
 ensure_packages_of_tags() {
     # Walk through the package names in ../aptmark/ files to ensure the respective
     # packages are installed.
@@ -7,15 +9,13 @@ ensure_packages_of_tags() {
             continue
         fi
         _PACKAGES=$(cat "${_PATH_APTMARK_TAG}" | sed -E 's/#.*//g' | sed -z 's/\n/ /g' | sed 's/  */ /g' | cut -c 2-)
-        _N_PACKAGES=$(echo "${_PACKAGES}" | wc -w)
-        _PROCESSED=''
-        echo ''
-        for _PACKAGE in ${_PACKAGES}; do
-            _PROCESSED="${_PROCESSED} ${_PACKAGE}"
-            _NTH=$(echo "${_PROCESSED}" | wc -w)
-            echo -n "\r# For tag '${_TAG}', ensuring installation of (${_NTH}/${_N_PACKAGES}):${_PROCESSED}"
-            apt-get -y -o Dpkg::Options::="--force-confnew" install "${_PACKAGE}" > /dev/null
-        done
+        echo -n "# For tag '${_TAG}', "
+        if [ -z "${_PACKAGES}" ]; then
+            echo "nothing to install."
+        else
+            echo "ensuring installation of: ${_PACKAGES}"
+            apt_get_edited "-o Dpkg::Options::='--force-confnew' install ${_PACKAGES}"
+        fi
     done
     echo ''
 }
diff --git a/trixie/scripts/from_older_upgrade.sh b/trixie/scripts/from_older_upgrade.sh
index 3d8daea..63cb50a 100755
--- a/trixie/scripts/from_older_upgrade.sh
+++ b/trixie/scripts/from_older_upgrade.sh
@@ -8,9 +8,10 @@ PATH_ETC_APT="${PATH_ETC}/apt"
 PATH_ETC_APT_CONF=${PATH_ETC_APT}/apt.conf.d
 PATH_COPY_TAG='../copy/all'
 
-# to reduce clutter …
+# to reduce clutter
 apt-get -y autoremove apt-listchanges > /dev/null
 
+# apt_get_edited needs this
 apt-get -q -q -y install calc > /dev/null
 
 apt_update_to_full_upgrade() {
-- 
2.30.2