From b9d76ca08c13ac759da36eb389b3fb404091bfbb Mon Sep 17 00:00:00 2001
From: kai <kai@pinguholic.de>
Date: Tue, 21 Apr 2026 14:46:02 +0000
Subject: [PATCH] Verbesserung der Telegram Messages

---
 scripts/update.sh | 46 +++++++++++++++++++++++++++++-----------------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/scripts/update.sh b/scripts/update.sh
index b77c8f4..1806031 100755
--- a/scripts/update.sh
+++ b/scripts/update.sh
@@ -10,6 +10,7 @@ TELEGRAM_CHAT_ID="${TELEGRAM_CHAT_ID:-581059353}"
 REBOOT=0
 DOCKER_UPDATES=0
 DOCKER_UPDATE_LIST=""
+DOCKER_MSG=""
 
 log() {
     echo "[$(date '+%F %T')] $1" | tee -a "$LOG"
@@ -35,20 +36,24 @@ cleanup_on_error() {
 trap 'cleanup_on_error ${LINENO}' ERR
 
 check_docker_updates() {
+
     if ! command -v docker >/dev/null 2>&1; then
-        log "Docker nicht installiert"
+        DOCKER_MSG="🚫 Docker: nicht installiert"
         return
     fi
 
     if ! docker info >/dev/null 2>&1; then
-        log "Docker Daemon nicht erreichbar"
+        DOCKER_MSG="⚠️ Docker: Daemon nicht erreichbar"
         return
     fi
 
     local containers
     mapfile -t containers < <(docker ps -q)
 
-    log "Prüfe ${#containers[@]} Container"
+    if [ "${#containers[@]}" -eq 0 ]; then
+        DOCKER_MSG="🐳 Docker: keine Container aktiv"
+        return
+    fi
 
     for cid in "${containers[@]}"; do
         local name image running_id latest_id
@@ -62,13 +67,19 @@ check_docker_updates() {
 
         if [[ -n "$latest_id" && "$running_id" != "$latest_id" ]]; then
             DOCKER_UPDATES=$((DOCKER_UPDATES + 1))
-            DOCKER_UPDATE_LIST+=$'\n'"🐳 $name ($image)"
-            log "Update verfügbar: $name"
+            DOCKER_UPDATE_LIST+=$'\n'"🐳 ${name} (${image})"
         fi
     done
+
+    if [ "$DOCKER_UPDATES" -gt 0 ]; then
+        DOCKER_MSG="🐳 Docker Updates: ${DOCKER_UPDATES}${DOCKER_UPDATE_LIST}"
+    else
+        DOCKER_MSG="🐳 Docker: aktuell"
+    fi
 }
 
 main() {
+
     mkdir -p "$(dirname "$LOG")"
     touch "$LOG"
 
@@ -89,24 +100,25 @@ main() {
 
     check_docker_updates
 
-    local msg="🐧 ${HOST}: Update abgeschlossen"
+    local msg
+    msg=$(cat <<EOF
+🐧 System Update Report
+━━━━━━━━━━━━━━━
+🖥 Host: ${HOST}
 
-    if [ "$REBOOT" -eq 1 ]; then
-        msg+="\n🔄 Reboot erforderlich"
-    else
-        msg+="\n✔ Kein Reboot nötig"
-    fi
+$( [ "$REBOOT" -eq 1 ] && echo "🔄 Reboot: erforderlich" || echo "✔ Reboot: nicht nötig" )
 
-    if [ "$DOCKER_UPDATES" -gt 0 ]; then
-        msg+="\n\n🐳 Docker Updates:${DOCKER_UPDATE_LIST}"
-    else
-        msg+="\n\n🐳 Docker aktuell"
-    fi
+${DOCKER_MSG}
+
+━━━━━━━━━━━━━━━
+📅 $(date '+%F %T')
+EOF
+)
 
     log "Sende Telegram"
     send_telegram "$msg"
 
-    log "=== Update Ende ==="
+    log "=== Update Ende ${HOST} ==="
 
     if [ "$REBOOT" -eq 1 ]; then
         reboot