From ce87cb90bb105d1d17bacd1d4dac90d4817b9857 Mon Sep 17 00:00:00 2001
From: Christian Heller <c.heller@plomlompom.de>
Date: Wed, 16 Apr 2025 03:25:16 +0200
Subject: [PATCH] Fix.

---
 .../home/catgirl/.local/bin/encrypt_catgirl_logs | 16 ++++++++--------
 bookworm/scripts/lib/ensure_packages_of_tags     |  3 +--
 bookworm/scripts/lib/init_packages               |  4 ++--
 bookworm/scripts/setup_server.sh                 |  2 +-
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/bookworm/home/catgirl/.local/bin/encrypt_catgirl_logs b/bookworm/home/catgirl/.local/bin/encrypt_catgirl_logs
index ba4bbf4..df1bd4a 100755
--- a/bookworm/home/catgirl/.local/bin/encrypt_catgirl_logs
+++ b/bookworm/home/catgirl/.local/bin/encrypt_catgirl_logs
@@ -13,24 +13,24 @@ TODAY="$(date +'%Y-%m-%d')"
 set +e
 PATHS_LOGFILES="$(ls ${PATH_LOGS}/*/*/*.log 2> /dev/null)"
 set -e
-if [ -z "${PATH_LOGFILES}" ]; then
+if [ -z "${PATHS_LOGFILES}" ]; then
     echo "No log files present, so nothing to do."
     exit 0
 fi
-for _PATH_LOG in $(ls "${PATH_LOGS}/*/*/*.log"); do
-    _FILENAME=$(basename "${PATH_LOG})"
+for _PATH_LOGFILE in ${PATHS_LOGFILES}; do
+    _FILENAME=$(basename "${PATH_LOGFILE})"
     _DATE_OF_LOG=$(echo "${FILENAME}" | cut -d'.' -f1)
-    _DIRNAME=$(dirname "${PATH_LOG})"
+    _DIRNAME=$(dirname "${PATH_LOGFILE})"
     _WINDOW_OF_LOG=$(basename "${_DIRNAME})"
     _DIRNAME=$(dirname "${_DIRNAME})"
     _NETWORK_OF_LOG=$(basename "${_DIRNAME})"
     if ! [ "${_DATE_OF_LOG}" < "${TODAY}" ]; then
-        echo "${_PATH_LOG} too young, ignoring."
+        echo "${_PATH_LOGFILE} too young, ignoring."
     else
-        echo "${_PATH_LOG}: encrypting to ${PATH_ENCRYPTED_LOGS}, deleting original …"
+        echo "${_PATH_LOGFILE}: encrypting to ${PATH_ENCRYPTED_LOGS}, deleting original …"
         _PATH_TARGET="${PATH_ENCRYPTED_LOGS}/${_NETWORK_OF_LOG}/${_WINDOW_OF_LOG}"
         mkdir -p "${_PATH_TARGET}"
-        age -R "${PATH_ENCRYPTION_KEY}" "${_PATH_LOG}" > "${_PATH_TARGET}/${_FILENAME}.age"
-        rm "${_PATH_LOG}"
+        age -R "${PATH_ENCRYPTION_KEY}" "${_PATH_LOGFILE}" > "${_PATH_TARGET}/${_FILENAME}.age"
+        rm "${_PATH_LOGFILE}"
     fi
 done
diff --git a/bookworm/scripts/lib/ensure_packages_of_tags b/bookworm/scripts/lib/ensure_packages_of_tags
index 8597b39..b076d33 100644
--- a/bookworm/scripts/lib/ensure_packages_of_tags
+++ b/bookworm/scripts/lib/ensure_packages_of_tags
@@ -6,10 +6,9 @@ ensure_packages_of_tags() {
         if [ ! -f "${_PATH_APTMARK_TAG}" ]; then
             continue
         fi
-        printf 'For tag "%s", ensuring installation of: ' "${_TAG}"
+        printf 'For tag "%s", installing:"
         cat "${_PATH_APTMARK_TAG}" | while read _LINE; do
             if [ ! $(echo "${_LINE}" | cut -c1) = "#" ]; then
-                echo -n "${_LINE} "
                 apt-get -q -y -o Dpkg::Options::="--force-confnew" install "${_LINE}"
             fi
         done
diff --git a/bookworm/scripts/lib/init_packages b/bookworm/scripts/lib/init_packages
index 70489db..b77dfc1 100644
--- a/bookworm/scripts/lib/init_packages
+++ b/bookworm/scripts/lib/init_packages
@@ -22,7 +22,7 @@ init_packages() {
     # before purging, ensure tagged packages installed
     ensure_packages_of_tags $@ 
     echo "Autoremove and purge …"
-    apt-get -q -y --purge autoremove
+    apt-get -qq -y --purge autoremove
     echo "And now: dist-upgrade …"
-    apt-get -q -y dist-upgrade
+    apt-get -qq -y dist-upgrade
 }
diff --git a/bookworm/scripts/setup_server.sh b/bookworm/scripts/setup_server.sh
index 1bd2778..88687a1 100755
--- a/bookworm/scripts/setup_server.sh
+++ b/bookworm/scripts/setup_server.sh
@@ -23,7 +23,7 @@ PATH_CADDYFILE="${PATH_ETC}/caddy/Caddyfile"
 
 echo '\nPreparing caddy install.'
 PATH_CADDY_REPO='https://dl.cloudsmith.io/public/caddy/stable'
-apt-get -q -y install curl
+apt-get -qq -y install curl
 curl -1Lf "${PATH_CADDY_REPO}/gpg.key" | gpg --dearmor -o /usr/share/keyrings/caddy-stable-archive-keyring.gpg
 curl -1Lf "${PATH_CADDY_REPO}/debian.deb.txt" > /etc/apt/sources.list.d/caddy-stable.list
 
-- 
2.30.2