From 4e20f9ee5d3559b64727f1b4f6a9c7c6571f209b Mon Sep 17 00:00:00 2001
From: Christian Heller <c.heller@plomlompom.de>
Date: Tue, 6 May 2025 02:20:13 +0200
Subject: [PATCH] Fix.

---
 bookworm/scripts/lib/prefixed_msg         | 6 +++++-
 bookworm/scripts/minimize_installation.sh | 2 +-
 bookworm/scripts/setup_catgirl.sh         | 3 +--
 bookworm/scripts/setup_seedbox.sh         | 3 +--
 bookworm/scripts/setup_server.sh          | 3 +--
 trixie/scripts/from_older_upgrade.sh      | 4 +---
 6 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/bookworm/scripts/lib/prefixed_msg b/bookworm/scripts/lib/prefixed_msg
index 8ebd158..c688cfc 100644
--- a/bookworm/scripts/lib/prefixed_msg
+++ b/bookworm/scripts/lib/prefixed_msg
@@ -1,6 +1,10 @@
 prefixed_msg_init() {
     export prefixed_msg_OLD_PREFIX="${prefixed_msg_PREFIX}|${prefixed_msg_OLD_PREFIX}"
-    export prefixed_msg_PREFIX="$1"
+    if [ -z "$1" ]; then
+        export prefixed_msg_PREFIX=$(basename "$0")
+    else
+        export prefixed_msg_PREFIX="$1"
+    fi
 }
 prefixed_msg_exit() {
     export prefixed_msg_PREFIX=$(echo "${prefixed_msg_OLD_PREFIX}" | cut -d'|' -f1)
diff --git a/bookworm/scripts/minimize_installation.sh b/bookworm/scripts/minimize_installation.sh
index ae682a2..22af105 100755
--- a/bookworm/scripts/minimize_installation.sh
+++ b/bookworm/scripts/minimize_installation.sh
@@ -5,7 +5,7 @@ cd $(dirname "$0")
 . lib/ensure_packages_of_tags
 . lib/prefixed_msg
 
-prefixed_msg_init 'minimize_installation'
+prefixed_msg_init
 _INSTALL_TAGS="$@"
 prefixed_msg "narrow system to what is required explicitly by Debian and by us, as per these INSTALL_TAGS: ${_INSTALL_TAGS}"
 
diff --git a/bookworm/scripts/setup_catgirl.sh b/bookworm/scripts/setup_catgirl.sh
index e7d6435..982a428 100755
--- a/bookworm/scripts/setup_catgirl.sh
+++ b/bookworm/scripts/setup_catgirl.sh
@@ -7,7 +7,7 @@ cd $(dirname "$0")
 . lib/install_tags
 . lib/prefixed_msg
 
-prefixed_msg_init 'setup_catgirl.sh'
+prefixed_msg_init
 prefixed_msg 'starting'
 
 expect_n_args 1 1 'IRC_PASSWORD' $@
@@ -26,5 +26,4 @@ systemctl enable --now catgirl
 prefixed_msg 'Activating catgirl logs encryption service/timer …'
 systemctl enable --now encrypt_catgirl_logs.timer
 
-prefixed_msg 'finished'
 prefixed_msg_exit
diff --git a/bookworm/scripts/setup_seedbox.sh b/bookworm/scripts/setup_seedbox.sh
index c312471..d00f856 100755
--- a/bookworm/scripts/setup_seedbox.sh
+++ b/bookworm/scripts/setup_seedbox.sh
@@ -6,7 +6,7 @@ cd $(dirname "$0")
 . lib/install_tags
 . lib/prefixed_msg
 
-prefixed_msg_init 'setup_seedbox.sh'
+prefixed_msg_init
 prefixed_msg 'starting'
 
 expect_n_args 0 0 '' $@
@@ -20,5 +20,4 @@ adduser --quiet --system --home /home/upload upload
 prefixed_msg 'Activating rtorrent tmux session service …'
 systemctl enable --now rtorrent
 
-prefixed_msg 'finished'
 prefixed_msg_exit
diff --git a/bookworm/scripts/setup_server.sh b/bookworm/scripts/setup_server.sh
index cce061e..b17335e 100755
--- a/bookworm/scripts/setup_server.sh
+++ b/bookworm/scripts/setup_server.sh
@@ -11,7 +11,7 @@ cd $(dirname "$0")
 . lib/prefixed_msg
 . lib/put_finished_marker
 
-prefixed_msg_init 'setup_server.sh'
+prefixed_msg_init
 prefixed_msg 'starting (setting up basics of standard server)'
 
 INSTALL_TAGS='all server user keep_if_installed:systemd-resolved'
@@ -97,5 +97,4 @@ prefixed_msg "Restarting caddy …"
 systemctl reload caddy
 
 put_finished_marker 'setup_server'
-prefixed_msg 'finished'
 prefixed_msg_exit
diff --git a/trixie/scripts/from_older_upgrade.sh b/trixie/scripts/from_older_upgrade.sh
index ed9be54..c8b2fd4 100755
--- a/trixie/scripts/from_older_upgrade.sh
+++ b/trixie/scripts/from_older_upgrade.sh
@@ -8,8 +8,7 @@ cd $(dirname "$0")
 . lib/expect_n_args
 . lib/prefixed_msg
 
-prefixed_msg_init 'from_older_upgrade.sh'
-
+prefixed_msg_init
 MSG_ALLOWED_INSTALLATION_TYPES='either "server" or "desktop"'
 expect_n_args 1 1 "INSTALLATION_TYPE (${MSG_ALLOWED_INSTALLATION_TYPES})" $@
 if [ "$1" != 'server' -a "$1" != 'desktop' ]; then
@@ -56,5 +55,4 @@ apt_update_to_full_upgrade
 prefixed_msg 'Autopurge!'
 apt_get_digested  '-q -q autopurge'
 
-prefixed_msg 'finished'
 prefixed_msg_exit
-- 
2.30.2