From 75e564552e3f127c5a2bda10f0981ae59864b6ba Mon Sep 17 00:00:00 2001 From: Christian Heller Date: Tue, 6 May 2025 00:37:47 +0200 Subject: [PATCH] Fix. --- bookworm/scripts/lib/apt_get_digested | 2 +- bookworm/scripts/lib/ensure_packages_of_tags | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bookworm/scripts/lib/apt_get_digested b/bookworm/scripts/lib/apt_get_digested index ca65f5c..4288d6e 100644 --- a/bookworm/scripts/lib/apt_get_digested +++ b/bookworm/scripts/lib/apt_get_digested @@ -67,7 +67,7 @@ DEBIAN_FRONTEND=noninteractive apt-get -y $1 2>&1 | while read _LINE; do printf ' %s' "${_COMPRESSED_ITEM}" fi done -printf '\r\n\n' +printf '\r\n' prefixed_msg_exit } diff --git a/bookworm/scripts/lib/ensure_packages_of_tags b/bookworm/scripts/lib/ensure_packages_of_tags index d70fd32..8218228 100644 --- a/bookworm/scripts/lib/ensure_packages_of_tags +++ b/bookworm/scripts/lib/ensure_packages_of_tags @@ -5,6 +5,7 @@ ensure_packages_of_tags() { prefixed_msg_init 'ensure_packages_of_tags' prefixed_msg 'starting' +_APT_ARG="-q -q -o 'Dpkg::Options::=--force-confnew' install" for _TAG in $@; do prefixed_msg_no_nl "For tag '${_TAG}', " if [ "$(echo ${_TAG} | cut -d':' -f1)" = 'keep_if_installed' ]; then @@ -12,7 +13,7 @@ for _TAG in $@; do printf 'checking if installed … ' if dpkg-query -Wf '${Package}\n' | grep '^'"${_PACKAGE}"'$' > /dev/null; then echo 'yup, keeping!' - apt_get_digested '-q -q -o "Dpkg::Options::=--force-confnew" install' "${_PACKAGE}" + apt_get_digested "${_APT_ARG} ${_PACKAGE}" else echo 'nope, nothing to keep.' fi @@ -28,7 +29,7 @@ for _TAG in $@; do echo 'nothing to install.' else echo "ensuring installation of: ${_PACKAGES}" - apt_get_digested '-q -q -o "Dpkg::Options::=--force-confnew" install' "${_PACKAGES}" + apt_get_digested "${_APT_ARG} ${_PACKAGES}" fi done prefixed_msg 'finished' -- 2.30.2