home · contact · privacy
Fix.
authorChristian Heller <c.heller@plomlompom.de>
Wed, 23 Apr 2025 11:30:14 +0000 (13:30 +0200)
committerChristian Heller <c.heller@plomlompom.de>
Wed, 23 Apr 2025 11:30:14 +0000 (13:30 +0200)
bookworm/scripts/lib/ensure_packages_of_tags
bookworm/scripts/lib/init_packages

index 87f59fe9839b0530e9e6232117d2f7660588c77f..7b0ef185f6eab0db404c94e3961afa867baa5a51 100644 (file)
@@ -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
 }
index 76cd978a3c9c2daf5e6bed91f0efb7b746fc940f..12a01c361446835f30f8a9caa476bf2d9ccf1fae 100644 (file)
@@ -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
 }