From 0d644c821d8e86b6e961869f6c4272798f8cbc80 Mon Sep 17 00:00:00 2001 From: Christian Heller Date: Wed, 23 Apr 2025 13:30:14 +0200 Subject: [PATCH] Fix. --- bookworm/scripts/lib/ensure_packages_of_tags | 16 +++++++++------- bookworm/scripts/lib/init_packages | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/bookworm/scripts/lib/ensure_packages_of_tags b/bookworm/scripts/lib/ensure_packages_of_tags index 87f59fe..7b0ef18 100644 --- a/bookworm/scripts/lib/ensure_packages_of_tags +++ b/bookworm/scripts/lib/ensure_packages_of_tags @@ -6,13 +6,15 @@ ensure_packages_of_tags() { if [ ! -f "${_PATH_APTMARK_TAG}" ]; then continue fi - echo -n "For tag '${_TAG}', ensuring this is installed: " - cat "${_PATH_APTMARK_TAG}" | while read _LINE; do - if [ ! $(echo "${_LINE}" | cut -c1) = "#" ]; then - echo -n "${_LINE} " - apt-get -y -o Dpkg::Options::="--force-confnew" install "${_LINE}" > /dev/null - fi - done + _PACKAGES=$(cat "${_PATH_APTMARK_TAG}" | sed -E 's/#.*//g' | sed -z 's/\n/ /g' | sed 's/ */ /g' | cut -c 2-) + _N_PACKAGES=$(echo "${_PACKAGES}" | wc -w) + _PROCESSED='' echo '' + for _PACKAGE in ${_PACKAGES}; do + _PROCESSED="${_PROCESSED} ${_PACKAGE}" + _NTH=$(echo "${_PROCESSED}" | wc -w) + echo -n "\rFor tag '${_TAG}', ensuring installation of (${_NTH}/(${_N_PACKAGES}): ${_PROCESSED}" + apt-get -y -o Dpkg::Options::="--force-confnew" install "${_PACKAGE}" > /dev/null + done done } diff --git a/bookworm/scripts/lib/init_packages b/bookworm/scripts/lib/init_packages index 76cd978..12a01c3 100644 --- a/bookworm/scripts/lib/init_packages +++ b/bookworm/scripts/lib/init_packages @@ -21,7 +21,7 @@ init_packages() { # before purging, ensure tagged packages installed ensure_packages_of_tags $@ echo "Autoremove and purge …" - apt-get -q -q -y --purge autoremove + apt-get -q -q -y autopurge echo "And now: dist-upgrade …" apt-get -y dist-upgrade > /dev/null } -- 2.30.2