From a374119b55b8adc64404c6b0c9cb28e4b54698c1 Mon Sep 17 00:00:00 2001 From: Christian Heller Date: Mon, 5 May 2025 22:41:10 +0200 Subject: [PATCH] Fix. --- bookworm/scripts/lib/apt_get_digested | 10 ++++++++-- bookworm/scripts/lib/core_setup | 2 +- bookworm/scripts/lib/ensure_packages_of_tags | 3 ++- bookworm/scripts/lib/install_tags | 2 +- bookworm/scripts/lib/minimize_installation | 3 ++- bookworm/scripts/lib/prefixed_msg | 17 +++++++++++++---- bookworm/scripts/setup_catgirl.sh | 2 +- bookworm/scripts/setup_seedbox.sh | 2 +- bookworm/scripts/setup_server.sh | 2 +- 9 files changed, 30 insertions(+), 13 deletions(-) diff --git a/bookworm/scripts/lib/apt_get_digested b/bookworm/scripts/lib/apt_get_digested index c1c7f02..91940f1 100644 --- 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 c612544..44b7552 100644 --- 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 4bcdace..06eb91b 100644 --- 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 e69ec79..39c0f4e 100644 --- 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 366625a..67050ac 100644 --- 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 dcb9264..374fe85 100644 --- 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 2736fcd..fff8ed7 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 '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 35abb87..f4e5ddb 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 '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 7c707b3..da17074 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 'setup_server.sh: ' prefixed_msg 'starting (setting up basics of standard server)' INSTALL_TAGS='all server user' -- 2.30.2