Fix.

diff --git a/bookworm/home/catgirl/.local/bin/encrypt_catgirl_logs b/bookworm/home/catgirl/.local/bin/encrypt_catgirl_logs
index 469f4ebc035b84fba37ed25e31fe8d70c7ebe834..111b27cb631736f1fa40d69411fd209b520f1f8b 100755 (executable)
--- a/bookworm/home/catgirl/.local/bin/encrypt_catgirl_logs
+++ b/bookworm/home/catgirl/.local/bin/encrypt_catgirl_logs
@@ -4,23 +4,31 @@ cd $(dirname "$0")
 . lib/expect_n_args
 . lib/constants_catgirl  # PATH_USER_SHARE_CATGIRL
 
 . lib/expect_n_args
 . lib/constants_catgirl  # PATH_USER_SHARE_CATGIRL
 

-expect_n_args 0
+expect_n_args 0 0 ''

 
 PATH_LOGS="${PATH_USER_SHARE_CATGIRL}/log"
 PATH_ENCRYPTED_LOGS="${HOME}/logs_encrypted"
 PATH_ENCRYPTION_KEY="${HOME}/.plomlib/encrypt_with.pub"
 TODAY="$(date +'%Y-%m-%d')"
 
 PATH_LOGS="${PATH_USER_SHARE_CATGIRL}/log"
 PATH_ENCRYPTED_LOGS="${HOME}/logs_encrypted"
 PATH_ENCRYPTION_KEY="${HOME}/.plomlib/encrypt_with.pub"
 TODAY="$(date +'%Y-%m-%d')"

-for _PATH_LOG in $(ls -1 "${PATH_LOGS}/*/*/*.log"); do
+PATHS_LOGFILES="$(ls ${PATH_LOGS}/*/*/*.log)"
+if [ -z "${PATH_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})"
     _DATE_OF_LOG=$(echo "${FILENAME}" | cut -d'.' -f1)
     _FILENAME=$(basename "${PATH_LOG})"
     _DATE_OF_LOG=$(echo "${FILENAME}" | cut -d'.' -f1)

-    _DIRNAME=$(dirname "${PATH_LOG}"
-    _WINDOW_OF_LOG=$(basename "${_DIRNAME}"
-    _DIRNAME=$(dirname "${_DIRNAME}"
-    _NETWORK_OF_LOG=$(basename "${_DIRNAME}"
-    if [ "${_DATE_OF_LOG}" < "${TODAY}" ]; then 
+    _DIRNAME=$(dirname "${PATH_LOG})"
+    _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."
+    else
+        echo "${_PATH_LOG}: encrypting to ${PATH_ENCRYPTED_LOGS}, deleting original …"

         _PATH_TARGET="${PATH_ENCRYPTED_LOGS}/${_NETWORK_OF_LOG}/${_WINDOW_OF_LOG}"
         _PATH_TARGET="${PATH_ENCRYPTED_LOGS}/${_NETWORK_OF_LOG}/${_WINDOW_OF_LOG}"

-        mkdir -p "${_PATH_TARGET}" 
+        mkdir -p "${_PATH_TARGET}"

         age -R "${PATH_ENCRYPTION_KEY}" "${_PATH_LOG}" > "${_PATH_TARGET}/${_FILENAME}.age"
         age -R "${PATH_ENCRYPTION_KEY}" "${_PATH_LOG}" > "${_PATH_TARGET}/${_FILENAME}.age"

-        rm "${_PATH_LOG}" 
+        rm "${_PATH_LOG}"

     fi
 done
     fi
 done