From b976f75165e40fb6b6792089e8e04c7dd85d77a5 Mon Sep 17 00:00:00 2001 From: sharky Date: Sun, 4 Oct 2026 22:05:23 +0200 Subject: [PATCH] manager.sh aktualisiert --- manager.sh | 293 +++++++++++++++++++++++++++++++++++------------------ 1 file changed, 195 insertions(+), 98 deletions(-) diff --git a/manager.sh b/manager.sh index eec9a3e..cfd771e 100644 --- a/manager.sh +++ b/manager.sh @@ -447,118 +447,215 @@ Diesen Zeitplan trotzdem wirklich uebernehmen?" no || return 2 } schedule_menu() { - local choice result rc + local choice result rc day month interval weekday local -a vals=() - choice="$(whiptail --title "Automatischer Zeitplan" \ - --ok-button "Weiter" --cancel-button "Zurueck" \ - --radiolist "Aktuell: + while true; do + choice="$(wt_menu "Zeitplan einstellen" \ +"AKTUELL $(schedule_desc) -Vorhandene Proxmox-Autobackups: +PROXMOX-AUTOBACKUPS $(backup_jobs) -Gewuenschten Rhythmus mit LEERTASTE markieren." \ - 26 100 8 \ - daily "Taeglich" "$([[ "$SCHEDULE_TYPE" == daily ]] && echo ON || echo OFF)" \ - weekly "Woechentlich (empfohlen)" "$([[ "$SCHEDULE_TYPE" == weekly ]] && echo ON || echo OFF)" \ - monthly "Monatlich" "$([[ "$SCHEDULE_TYPE" == monthly ]] && echo ON || echo OFF)" \ - interval "Alle X Monate" "$([[ "$SCHEDULE_TYPE" == interval ]] && echo ON || echo OFF)" \ - yearly "Jaehrlich" "$([[ "$SCHEDULE_TYPE" == yearly ]] && echo ON || echo OFF)" \ - custom "Eigener systemd-Zeitplan" "$([[ "$SCHEDULE_TYPE" == custom ]] && echo ON || echo OFF)" \ - 3>&1 1>&2 2>&3 &1 1>&2 2>&3 &1 1>&2 2>&3 &1 1>&2 2>&3 &1 1>&2 2>&3 &1 1>&2 2>&3 &1 1>&2 2>&3 /dev/null 2>&1 && ! systemd-analyze calendar "$ONCALENDAR" >/dev/null 2>&1; then - wt_msg "Ungueltiger Zeitplan" "systemd akzeptiert diesen Zeitplan nicht: +Beispiel: 04:00"; continue; } + SCHEDULE_TYPE=daily + SCHEDULE_TIME="$result" + ;; + + 2) + weekday="$(whiptail --title "Woechentlicher Zeitplan" \ + --ok-button "Weiter" --cancel-button "Zurueck" \ + --radiolist "Wochentag auswaehlen:" 20 72 8 \ + Mon "Montag" "$([[ "$SCHEDULE_WEEKDAY" == Mon ]] && echo ON || echo OFF)" \ + Tue "Dienstag" "$([[ "$SCHEDULE_WEEKDAY" == Tue ]] && echo ON || echo OFF)" \ + Wed "Mittwoch" "$([[ "$SCHEDULE_WEEKDAY" == Wed ]] && echo ON || echo OFF)" \ + Thu "Donnerstag" "$([[ "$SCHEDULE_WEEKDAY" == Thu ]] && echo ON || echo OFF)" \ + Fri "Freitag" "$([[ "$SCHEDULE_WEEKDAY" == Fri ]] && echo ON || echo OFF)" \ + Sat "Samstag" "$([[ "$SCHEDULE_WEEKDAY" == Sat ]] && echo ON || echo OFF)" \ + Sun "Sonntag" "$([[ "$SCHEDULE_WEEKDAY" == Sun ]] && echo ON || echo OFF)" \ + 3>&1 1>&2 2>&3 &1 1>&2 2>&3 &1 1>&2 2>&3 &1 1>&2 2>&3 &1 1>&2 2>&3 &1 1>&2 2>&3 &1 1>&2 2>&3 &1 1>&2 2>&3 /dev/null 2>&1; then + wt_msg "Fehler" "systemd akzeptiert diesen Zeitplan nicht." + continue + fi + SCHEDULE_TYPE=custom + ONCALENDAR="$result" + ;; + + 7) return ;; + esac + + build_calendar + if ! systemd-analyze calendar "$ONCALENDAR" >/dev/null 2>&1; then + wt_msg "Fehler" "Der erzeugte systemd-Zeitplan ist ungueltig: $ONCALENDAR" - return - fi + continue + fi - set +e - review_schedule - rc=$? - set -e - [[ "$rc" -eq 0 ]] || return + set +e + review_schedule + rc=$? + set -e + + case "$rc" in + 0) return ;; + 1) return ;; + 2) continue ;; + esac + done } exclusions_menu() {