From e2e6bba06aac633c8368169e5c89779354ce8cee Mon Sep 17 00:00:00 2001 From: sharky Date: Sun, 4 Oct 2026 20:19:42 +0200 Subject: [PATCH] V23 --- updater.sh | 43 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 40 insertions(+), 3 deletions(-) diff --git a/updater.sh b/updater.sh index eff6518..c0eef62 100644 --- a/updater.sh +++ b/updater.sh @@ -208,7 +208,22 @@ guest_failed() { add_guest_result() { local type="$1" id="$2" name="$3" status="$4" local line="$id ($name): $status" - if [[ "$type" == "LXC" ]]; then LXC_RESULT_DETAILS+=("$line"); else VM_RESULT_DETAILS+=("$line"); fi + local -a out=() + local entry + + if [[ "$type" == "LXC" ]]; then + for entry in "${LXC_RESULT_DETAILS[@]}"; do + [[ "${entry%%:*}" == "$id ($name)" ]] || out+=("$entry") + done + out+=("$line") + LXC_RESULT_DETAILS=("${out[@]}") + else + for entry in "${VM_RESULT_DETAILS[@]}"; do + [[ "${entry%%:*}" == "$id ($name)" ]] || out+=("$entry") + done + out+=("$line") + VM_RESULT_DETAILS=("${out[@]}") + fi } proxmox_backup_running() { @@ -308,8 +323,6 @@ collect_guest_result_details() { } send_update_notification() { - collect_guest_result_details - local lxc_detail_text="Keine" local vm_detail_text="Keine" local guest_line @@ -770,6 +783,7 @@ update_lxc() { if is_excluded "$id"; then log "CT $id ($name): ausgeschlossen." LXC_SKIPPED=$((LXC_SKIPPED + 1)) + add_guest_result "LXC" "$id" "$name" "übersprungen" return fi @@ -777,6 +791,7 @@ update_lxc() { if [[ "$UPDATE_STOPPED" != "yes" ]]; then log "CT $id ($name): gestoppt -> übersprungen." LXC_SKIPPED=$((LXC_SKIPPED + 1)) + add_guest_result "LXC" "$id" "$name" "übersprungen" return fi @@ -786,6 +801,7 @@ update_lxc() { log "CT $id ($name): Start fehlgeschlagen." mark_guest_failed "LXC" "$id" LXC_FAILED=$((LXC_FAILED + 1)) + add_guest_result "LXC" "$id" "$name" "fehlgeschlagen" ERRORS=$((ERRORS + 1)) return fi @@ -802,6 +818,7 @@ update_lxc() { fi LXC_SKIPPED=$((LXC_SKIPPED + 1)) + add_guest_result "LXC" "$id" "$name" "übersprungen" return fi @@ -814,6 +831,7 @@ update_lxc() { add_error "CT $id ($name): apt-get update fehlgeschlagen" mark_guest_failed "LXC" "$id" LXC_FAILED=$((LXC_FAILED + 1)) + add_guest_result "LXC" "$id" "$name" "fehlgeschlagen" ERRORS=$((ERRORS + 1)) if [[ "$started_by_us" == "yes" ]]; then @@ -834,6 +852,7 @@ update_lxc() { add_error "CT $id ($name): upgrade Simulation fehlgeschlagen" mark_guest_failed "LXC" "$id" LXC_FAILED=$((LXC_FAILED + 1)) + add_guest_result "LXC" "$id" "$name" "fehlgeschlagen" ERRORS=$((ERRORS + 1)) if [[ "$started_by_us" == "yes" ]]; then @@ -851,6 +870,7 @@ update_lxc() { add_error "CT $id ($name): upgrade Simulation konnte nicht ausgewertet werden" mark_guest_failed "LXC" "$id" LXC_FAILED=$((LXC_FAILED + 1)) + add_guest_result "LXC" "$id" "$name" "fehlgeschlagen" ERRORS=$((ERRORS + 1)) if [[ "$started_by_us" == "yes" ]]; then pct shutdown "$id" --timeout 60 || pct stop "$id" @@ -861,6 +881,7 @@ update_lxc() { if (( upgraded == 0 && installed == 0 && removed == 0 )); then log "CT $id ($name): bereits aktuell." LXC_CURRENT=$((LXC_CURRENT + 1)) + add_guest_result "LXC" "$id" "$name" "bereits aktuell" else log "CT $id ($name): $upgraded Upgrade(s), $installed Neuinstallation(en), $removed Entfernung(en)." @@ -871,6 +892,7 @@ update_lxc() { add_error "CT $id ($name): upgrade fehlgeschlagen" mark_guest_failed "LXC" "$id" LXC_FAILED=$((LXC_FAILED + 1)) + add_guest_result "LXC" "$id" "$name" "fehlgeschlagen" ERRORS=$((ERRORS + 1)) if [[ "$started_by_us" == "yes" ]]; then @@ -900,6 +922,7 @@ update_lxc() { LXC_OK=$((LXC_OK - 1)) mark_guest_failed "LXC" "$id" LXC_FAILED=$((LXC_FAILED + 1)) + add_guest_result "LXC" "$id" "$name" "fehlgeschlagen" ERRORS=$((ERRORS + 1)) fi fi @@ -1043,6 +1066,7 @@ update_vm() { if is_excluded "$id"; then log "VM $id ($name): ausgeschlossen." VM_SKIPPED=$((VM_SKIPPED + 1)) + add_guest_result "VM" "$id" "$name" "übersprungen" return fi @@ -1055,6 +1079,7 @@ update_vm() { win10|win11|win7|win8|wvista|wxp|w2k|w2k3|w2k8) log "VM $id ($name): Windows-VM -> übersprungen." VM_SKIPPED=$((VM_SKIPPED + 1)) + add_guest_result "VM" "$id" "$name" "übersprungen" return ;; esac @@ -1063,6 +1088,7 @@ update_vm() { if [[ "$UPDATE_STOPPED" != "yes" ]]; then log "VM $id ($name): gestoppt -> übersprungen." VM_SKIPPED=$((VM_SKIPPED + 1)) + add_guest_result "VM" "$id" "$name" "übersprungen" return fi @@ -1072,6 +1098,7 @@ update_vm() { log "VM $id ($name): Start fehlgeschlagen." mark_guest_failed "VM" "$id" VM_FAILED=$((VM_FAILED + 1)) + add_guest_result "VM" "$id" "$name" "fehlgeschlagen" ERRORS=$((ERRORS + 1)) return fi @@ -1090,6 +1117,7 @@ update_vm() { mark_guest_failed "VM" "$id" VM_FAILED=$((VM_FAILED + 1)) + add_guest_result "VM" "$id" "$name" "fehlgeschlagen" ERRORS=$((ERRORS + 1)) return fi @@ -1107,6 +1135,7 @@ update_vm() { mark_guest_failed "VM" "$id" VM_FAILED=$((VM_FAILED + 1)) + add_guest_result "VM" "$id" "$name" "fehlgeschlagen" ERRORS=$((ERRORS + 1)) return fi @@ -1120,6 +1149,7 @@ update_vm() { mark_guest_failed "VM" "$id" VM_FAILED=$((VM_FAILED + 1)) + add_guest_result "VM" "$id" "$name" "fehlgeschlagen" ERRORS=$((ERRORS + 1)) return fi @@ -1132,6 +1162,7 @@ update_vm() { fi VM_SKIPPED=$((VM_SKIPPED + 1)) + add_guest_result "VM" "$id" "$name" "übersprungen" return fi @@ -1144,6 +1175,7 @@ update_vm() { add_error "VM $id ($name): apt-get update fehlgeschlagen" mark_guest_failed "VM" "$id" VM_FAILED=$((VM_FAILED + 1)) + add_guest_result "VM" "$id" "$name" "fehlgeschlagen" ERRORS=$((ERRORS + 1)) if [[ "$started_by_us" == "yes" ]]; then @@ -1181,6 +1213,7 @@ update_vm() { add_error "VM $id ($name): upgrade Simulation fehlgeschlagen" mark_guest_failed "VM" "$id" VM_FAILED=$((VM_FAILED + 1)) + add_guest_result "VM" "$id" "$name" "fehlgeschlagen" ERRORS=$((ERRORS + 1)) if [[ "$started_by_us" == "yes" ]]; then qm shutdown "$id" --timeout 60 || qm stop "$id" @@ -1206,6 +1239,7 @@ update_vm() { add_error "VM $id ($name): upgrade Simulation konnte nicht ausgewertet werden" mark_guest_failed "VM" "$id" VM_FAILED=$((VM_FAILED + 1)) + add_guest_result "VM" "$id" "$name" "fehlgeschlagen" ERRORS=$((ERRORS + 1)) if [[ "$started_by_us" == "yes" ]]; then qm shutdown "$id" --timeout 60 || qm stop "$id" @@ -1218,6 +1252,7 @@ update_vm() { if (( upgraded == 0 && installed == 0 && removed == 0 )); then log "VM $id ($name): bereits aktuell." VM_CURRENT=$((VM_CURRENT + 1)) + add_guest_result "VM" "$id" "$name" "bereits aktuell" else log "VM $id ($name): $upgraded Upgrade(s), $installed Neuinstallation(en), $removed Entfernung(en)." @@ -1228,6 +1263,7 @@ update_vm() { add_error "VM $id ($name): upgrade fehlgeschlagen" mark_guest_failed "VM" "$id" VM_FAILED=$((VM_FAILED + 1)) + add_guest_result "VM" "$id" "$name" "fehlgeschlagen" ERRORS=$((ERRORS + 1)) if [[ "$started_by_us" == "yes" ]]; then @@ -1257,6 +1293,7 @@ update_vm() { VM_OK=$((VM_OK - 1)) mark_guest_failed "VM" "$id" VM_FAILED=$((VM_FAILED + 1)) + add_guest_result "VM" "$id" "$name" "fehlgeschlagen" ERRORS=$((ERRORS + 1)) fi fi