Fix.

diff --git a/bookworm/scripts/lib/apt_get_digested b/bookworm/scripts/lib/apt_get_digested
index c1c7f027022ca7e3c583c164dc5e960f4c757fe9..91940f1b6c46cecb1ba1262ecb93b1ed97d5c0e2 100644 (file)
--- a/bookworm/scripts/lib/apt_get_digested
+++ b/bookworm/scripts/lib/apt_get_digested
@@ -1,5 +1,8 @@
 . lib/abort_if_command_unknown
+. lib/prefixed_msg
+
 apt_get_digested() {
+prefixed_msg_init 'apt_get_digested: '
 
 abort_if_command_unknown calc
 
@@ -18,7 +21,7 @@ Purging configuration files:|Purging configuration files for ([[:print:]]+) \([[
 Removing:|Removing ([[:print:]]+) \([[:print:]]+\) \.\.\.|\1
 Removing diversion(s):|Removing '"'"'diversion of ([[:print:]]+) to ([[:print:]]+) by ([[:print:]]+)| \3:[\1 → \2]
 Removing obsolete conffile(s):|Removing obsolete conffile ([[:print:]]+) \.\.\.|\1
-Selecting previously unselected: |Selecting previously unselected package ([[:print:]]+)\.|\1
+Selecting previously unselected:|Selecting previously unselected package ([[:print:]]+)\.|\1
 Setting up:|Setting up ([[:print:]]+) \([[:print:]]+\) \.\.\.|\1
 Updating to current default:|Updating ([[:print:]]+) to current default.|\1
 disabled or static unit, so not starting:|([[:print:]]+) is a disabled or a static unit, not starting it\.|\1
@@ -57,11 +60,14 @@ 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_digested: %s' "${_PREFIX}"
+            printf '\n\r'
+            prefixed_msg_no_nl '%s' "${_PREFIX}"
             _LAST_PREFIX="${_PREFIX}"
         fi
         printf ' %s' "${_COMPRESSED_ITEM}"
     fi
 done
 printf '\r\n\n'
+
+prefixed_msg_exit
 }

diff --git a/bookworm/scripts/lib/core_setup b/bookworm/scripts/lib/core_setup
index c6125443cf9b2b8451a205a8d7d62fdd532a88ed..44b7552fcdfe8964c491c693bfa5bcef35986750 100644 (file)
--- a/bookworm/scripts/lib/core_setup
+++ b/bookworm/scripts/lib/core_setup
@@ -4,7 +4,7 @@
 . lib/minimize_installation
 . lib/prefixed_msg
 core_setup() {
-prefixed_msg_init '### core_setup: '
+prefixed_msg_init 'core_setup: '
 prefixed_msg 'starting (performing standard installation setup steps)'
 
 _HOSTNAME="$1"

diff --git a/bookworm/scripts/lib/ensure_packages_of_tags b/bookworm/scripts/lib/ensure_packages_of_tags
index 4bcdacec2586d3a2fe36c09c876b05940b25475d..06eb91b47d213dc86dcb59a3ae576bed2143d617 100644 (file)
--- a/bookworm/scripts/lib/ensure_packages_of_tags
+++ b/bookworm/scripts/lib/ensure_packages_of_tags
@@ -1,7 +1,8 @@
 . lib/apt_get_digested
 . lib/prefixed_msg
+
 ensure_packages_of_tags() {
-prefixed_msg_init '# ensure_packages_of_tags: '
+prefixed_msg_init 'ensure_packages_of_tags: '
 prefixed_msg 'starting (walking through package names in ../aptmark/ files to ensure respective packages are installed'
 
 for _TAG in $@; do

diff --git a/bookworm/scripts/lib/install_tags b/bookworm/scripts/lib/install_tags
index e69ec79523d98e899b6dc8943a64ad8035769176..39c0f4e67512b7fb3e7e55b6353f898635482e41 100644 (file)
--- a/bookworm/scripts/lib/install_tags
+++ b/bookworm/scripts/lib/install_tags
@@ -2,7 +2,7 @@
 . lib/ensure_packages_of_tags
 . lib/prefixed_msg
 install_tags() {
-    prefixed_msg_init '# install_tags: '
+    prefixed_msg_init 'install_tags: '
 
     _INSTALL_TAGS="$@"
     prefixed_msg "Installing packages and files for: ${_INSTALL_TAGS}"

diff --git a/bookworm/scripts/lib/minimize_installation b/bookworm/scripts/lib/minimize_installation
index 366625afe37f5441a299746cb0fd1e6a8fe518b0..67050acd79ffd9687e3b6c77017465c99cc6f276 100644 (file)
--- a/bookworm/scripts/lib/minimize_installation
+++ b/bookworm/scripts/lib/minimize_installation
@@ -1,8 +1,9 @@
 . lib/apt_get_digested
 . lib/ensure_packages_of_tags
 . lib/prefixed_msg
+
 minimize_installation() {
-prefixed_msg_init '### minimize_installation: '
+prefixed_msg_init 'minimize_installation: '
 _INSTALL_TAGS="$@"
 prefixed_msg "starting (narrow system to what is required explicitly by Debian and by us, as per these INSTALL_TAGS: ${_INSTALL_TAGS})"
 

diff --git a/bookworm/scripts/lib/prefixed_msg b/bookworm/scripts/lib/prefixed_msg
index dcb92646a46e972a8529be678c56336d2e1f33e8..374fe8580b58613efbab1a16c34c5caf7045e3f2 100644 (file)
--- a/bookworm/scripts/lib/prefixed_msg
+++ b/bookworm/scripts/lib/prefixed_msg
@@ -6,9 +6,18 @@ prefixed_msg_exit() {
     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"
-}
+
 prefixed_msg_no_nl() {
-    printf '%s%s' "${prefixed_msg_PREFIX}" "$1"
+    _INDENTOR='##'
+    _INDENT="${_INDENTOR}"
+    _SEPARATORS=$(echo "${_prefixed_msg_OLD_PREFIX}" | sed 's/[^|]//g')
+    while [ ! -z "${_SEPARATORS}" ]; do
+        _INDENT='${_INDENT}${_INDENTOR}'
+        _SEPARATORS=$(echo "${_SEPARATORS}" | cut -d'| -f2-)
+    done
+    printf '%s%s%s' "${_INDENT}" "${prefixed_msg_PREFIX}" "$1"
+}
+prefixed_msg() {
+    prefixed_msg_no_nl "$1"
+    printf '\n'
 }

diff --git a/bookworm/scripts/setup_catgirl.sh b/bookworm/scripts/setup_catgirl.sh
index 2736fcd0b51d1201b332be0f7c3cf681df92f2ed..fff8ed7c1936d900f203827b4c9fd87db98b663d 100755 (executable)
--- 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 'setup_catgirl.sh: '
 prefixed_msg 'starting'
 
 expect_n_args 1 1 'IRC_PASSWORD' $@

diff --git a/bookworm/scripts/setup_seedbox.sh b/bookworm/scripts/setup_seedbox.sh
index 35abb87cc0975420ad9f2074aea2e52e16a7bea0..f4e5ddbbad555ca5acbfff0b139eadf28f963d6f 100755 (executable)
--- 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 'setup_seedbox.sh: '
 prefixed_msg 'starting'
 
 expect_n_args 0 0 '' $@

diff --git a/bookworm/scripts/setup_server.sh b/bookworm/scripts/setup_server.sh
index 7c707b30fc1642a3e449dd50eedc9d124149a5a5..da170745b1857a469fa519560339106874479f02 100755 (executable)
--- 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 'setup_server.sh: '
 prefixed_msg 'starting (setting up basics of standard server)'
 
 INSTALL_TAGS='all server user'