From 9e7aa69b58b23a61d8ce60c5a9a6f6bc0f0a6b99 Mon Sep 17 00:00:00 2001
From: Christian Heller <c.heller@plomlompom.de>
Date: Mon, 5 May 2025 22:13:54 +0200
Subject: [PATCH] Fixed.

---
 bookworm/scripts/lib/{apt_get_edited => apt_get_digested} | 4 ++--
 bookworm/scripts/lib/core_setup                           | 3 ++-
 bookworm/scripts/lib/ensure_packages_of_tags              | 4 ++--
 bookworm/scripts/lib/minimize_installation                | 4 ++--
 bookworm/scripts/lib/prefixed_msg                         | 5 +++--
 testing/scripts/lib/apt_get_edited                        | 1 -
 6 files changed, 11 insertions(+), 10 deletions(-)
 rename bookworm/scripts/lib/{apt_get_edited => apt_get_digested} (97%)
 delete mode 120000 testing/scripts/lib/apt_get_edited

diff --git a/bookworm/scripts/lib/apt_get_edited b/bookworm/scripts/lib/apt_get_digested
similarity index 97%
rename from bookworm/scripts/lib/apt_get_edited
rename to bookworm/scripts/lib/apt_get_digested
index 960e4ff..c1c7f02 100644
--- a/bookworm/scripts/lib/apt_get_edited
+++ b/bookworm/scripts/lib/apt_get_digested
@@ -1,5 +1,5 @@
 . lib/abort_if_command_unknown
-apt_get_edited() {
+apt_get_digested() {
 
 abort_if_command_unknown calc
 
@@ -57,7 +57,7 @@ DEBIAN_FRONTEND=noninteractive apt-get -y $1 2>&1 | while read _LINE; do
         printf '\n\r%s' "${_LINE}"
     else
         if [ "${_PREFIX}" != "${_LAST_PREFIX}" ]; then
-            printf '\n\r# apt_get_edited: %s' "${_PREFIX}"
+            printf '\n\r# apt_get_digested: %s' "${_PREFIX}"
             _LAST_PREFIX="${_PREFIX}"
         fi
         printf ' %s' "${_COMPRESSED_ITEM}"
diff --git a/bookworm/scripts/lib/core_setup b/bookworm/scripts/lib/core_setup
index 9c3ace4..c612544 100644
--- a/bookworm/scripts/lib/core_setup
+++ b/bookworm/scripts/lib/core_setup
@@ -1,3 +1,4 @@
+. lib/apt_get_digested
 . lib/constants_user  # USERNAME
 . lib/copy_dirtrees_of_tags
 . lib/minimize_installation
@@ -14,7 +15,7 @@ _INSTALL_TAGS="$4"
 minimize_installation ${_INSTALL_TAGS}
 
 prefixed_msg 'And now: dist-upgrade …'
-apt_get_edited '-q -q dist-upgrade' 
+apt_get_digested '-q -q dist-upgrade' 
 
 prefixed_msg "Setting up user: ${USERNAME}"
 adduser --quiet --disabled-password --gecos "" "${USERNAME}"
diff --git a/bookworm/scripts/lib/ensure_packages_of_tags b/bookworm/scripts/lib/ensure_packages_of_tags
index 941e262..4bcdace 100644
--- a/bookworm/scripts/lib/ensure_packages_of_tags
+++ b/bookworm/scripts/lib/ensure_packages_of_tags
@@ -1,4 +1,4 @@
-. lib/apt_get_edited
+. lib/apt_get_digested
 . lib/prefixed_msg
 ensure_packages_of_tags() {
 prefixed_msg_init '# ensure_packages_of_tags: '
@@ -15,7 +15,7 @@ for _TAG in $@; do
         echo "nothing to install."
     else
         echo "ensuring installation of: ${_PACKAGES}"
-        apt_get_edited "-q -q -o Dpkg::Options::=--force-confnew install ${_PACKAGES}"
+        apt_get_digested "-q -q -o Dpkg::Options::=--force-confnew install ${_PACKAGES}"
     fi
 done
 prefixed_msg 'finished'
diff --git a/bookworm/scripts/lib/minimize_installation b/bookworm/scripts/lib/minimize_installation
index 7c993d2..366625a 100644
--- a/bookworm/scripts/lib/minimize_installation
+++ b/bookworm/scripts/lib/minimize_installation
@@ -1,4 +1,4 @@
-. lib/apt_get_edited
+. lib/apt_get_digested
 . lib/ensure_packages_of_tags
 . lib/prefixed_msg
 minimize_installation() {
@@ -37,7 +37,7 @@ prefixed_msg 'install or mark as manually installed packages from our own select
 ensure_packages_of_tags ${_INSTALL_TAGS} 
 
 prefixed_msg 'run autopurge to get rid of all unwanted packages …'
-apt_get_edited '-q -q autopurge'
+apt_get_digested '-q -q autopurge'
 
 prefixed_msg 'finished'
 prefixed_msg_exit
diff --git a/bookworm/scripts/lib/prefixed_msg b/bookworm/scripts/lib/prefixed_msg
index b1b32fc..dcb9264 100644
--- a/bookworm/scripts/lib/prefixed_msg
+++ b/bookworm/scripts/lib/prefixed_msg
@@ -1,9 +1,10 @@
 prefixed_msg_init() {
-    prefixed_msg_OLD_PREFIX="${prefixed_msg_PREFIX}"
+    prefixed_msg_OLD_PREFIX="${prefixed_msg_PREFIX}|${prefixed_msg_OLD_PREFIX}"
     prefixed_msg_PREFIX="$1"
 }
 prefixed_msg_exit() {
-    prefixed_msg_PREFIX="${prefixed_msg_OLD_PREFIX}"
+    prefixed_msg_PREFIX=$(echo "${prefixed_msg_OLD_PREFIX}" | cut -d'|' -f1)
+    prefixed_msg_OLD_PREFIX=$(echo "${prefixed_msg_OLD_PREFIX}" | cut -d'|' -f2-)
 }
 prefixed_msg() {
     printf '%s%s\n' "${prefixed_msg_PREFIX}" "$1"
diff --git a/testing/scripts/lib/apt_get_edited b/testing/scripts/lib/apt_get_edited
deleted file mode 120000
index 82f1893..0000000
--- a/testing/scripts/lib/apt_get_edited
+++ /dev/null
@@ -1 +0,0 @@
-../../../trixie/scripts/lib/apt_get_edited
\ No newline at end of file
-- 
2.30.2