From 21be8f3864118ff5a4b7041e4fffc5164ad83e87 Mon Sep 17 00:00:00 2001
From: Hartmut Bauer <hb42@gmx.de>
Date: Sat, 10 May 2025 14:42:05 +0200
Subject: [PATCH] fix mail.sh, log results of auto update

---
 hamiller.sh |  2 +-
 mail.sh     |  7 +++++--
 main.inc.sh | 17 ++++++++++++++++-
 main.sh     |  4 +++-
 nathan.sh   |  2 ++
 5 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/hamiller.sh b/hamiller.sh
index 4f3383f..4dde6ab 100755
--- a/hamiller.sh
+++ b/hamiller.sh
@@ -27,7 +27,7 @@ after_backup() {
     let rc=rc+$?
     copy_to_nas "$BACKUP_TARGET" "$NAS_TARGET"
     let rc=rc+$?
-    check_services
+    #check_services
     let rc=rc+$?
     return $rc
 }
diff --git a/mail.sh b/mail.sh
index 6f5f948..f32a05f 100755
--- a/mail.sh
+++ b/mail.sh
@@ -13,7 +13,10 @@
 #
 
 PODMAN=/usr/bin/podman
-SUDO="sudo -u container sh -c"
+#
+# -i ist entscheident, damit die restliche Kommandozeile sauber ausgewertet wird
+#    das ersetzt den expliziten Aufruf mit "sh -c "..." "
+SUDO="sudo -u container -i"
 MAILCONTAINER=smtp-relay
 MAILSERVER_IP=10.4.2.30
 REMOTE=""
@@ -48,7 +51,7 @@ CONTENT=$(cat ${1:--})
 
 MAILCMD="$SUDO $PODMAN exec -i $MAILCONTAINER /usr/sbin/sendmail -i -t"
 if [ ! -z "$REMOTE" ]; then
-    MAILCMD="ssh $MAILSERVER_IP \"$MAILCMD\""
+    MAILCMD="ssh $MAILSERVER_IP $MAILCMD"
 fi
 # construct mail header + content and pipe to sendmail
 cat <<EOMB | $MAILCMD
diff --git a/main.inc.sh b/main.inc.sh
index 57123a4..be5eccb 100755
--- a/main.inc.sh
+++ b/main.inc.sh
@@ -26,7 +26,9 @@ LIST_EXT=list
 SYNO_USB=/usr/syno/bin/synousbdisk
 SYSTEMCTL_USER="/usr/bin/systemctl --user --machine=container@"
 SYSTEMCTL="/usr/bin/systemctl"
-CONTAINER_EXEC_USER=" sudo -u container podman exec"
+PODMAN=" sudo -u container podman"
+CONTAINER_EXEC_USER=" $PODMAN exec"
+CONTAINER_SVC_UPDATE_USER=" $PODMAN auto-update"
 CONTAINER_EXEC="podman exec"
 
 LOG_RECIPIENT=hb242@pm.me
@@ -195,8 +197,21 @@ do_start_stop_containers() {
     return $rc
 }
 
+update_services() {
+    log $DEBUG "$DBG update_services()"
+    mail_log $INFO "$INF    update services"
+    local upd=$($CONTAINER_SVC_UPDATE_USER 2>&1 | tee $LOG_FILE | egrep 'registry\s+true' | sed 's/^.* \([^[:space:]]*\/[^[:space:]]*\).*$/\1/g')
+    check_pipe_rc ${PIPESTATUS[@]}
+    local rc=$?
+    for i in $upd; do
+        mail_log $INFO "$INF      $i"
+    done
+    return $rc
+}
+
 check_services() {
     log $DEBUG "$DBG check_services()"
+    mail_log $INFO "$INF    check services"
     $HERE/check.sh >>$LOG_FILE 2>&1
     return $?
 }
diff --git a/main.sh b/main.sh
index 2298699..db0a28b 100755
--- a/main.sh
+++ b/main.sh
@@ -3,6 +3,8 @@
 # entrypoint for all actions
 #
 
+# 2.1.16  10.05.2025 - fix mail.sh, log results of auto-update
+# 2.1.15  09.05.2025 - podman auto-update
 # 2.1.14  09.05.2025 - Fix mail.sh, homeserver.target, cleared all docker references
 # 2.1.13  08.05.2025 - check if services are running after backup
 # 2.1.12  08.05.2025 - mail.sh an neuen Container angepasst
@@ -13,7 +15,7 @@
 # 2.1.7   29.04.2025 - 1. Schritt zur Umstellung auf podman
 # 2.1.6   29.04.2025 - weekly backup Sa->SO
 
-VER="2.1.13"
+VER="2.1.16"
 
 HERE=$(dirname "$0")
 THIS_SCRIPT=$0
diff --git a/nathan.sh b/nathan.sh
index 26848ff..f4487e6 100755
--- a/nathan.sh
+++ b/nathan.sh
@@ -45,6 +45,8 @@ after_backup() {
     let rc=rc+$?
     copy_to_nas "$BACKUP_TARGET" "$NAS_TARGET"
     let rc=rc+$?
+    update_services
+    let rc=rc+$?
     check_services
     let rc=rc+$?
     return $rc