From 919b7e7ce57e5b285ed18733fcc561210b42a7df Mon Sep 17 00:00:00 2001 From: boksbc Date: Sat, 25 Oct 2025 13:48:49 +0200 Subject: [PATCH] Dovecot Systax Problem --- scripts/88-update-wrapper.sh | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/scripts/88-update-wrapper.sh b/scripts/88-update-wrapper.sh index 8dd80e4..b6a3911 100644 --- a/scripts/88-update-wrapper.sh +++ b/scripts/88-update-wrapper.sh @@ -74,9 +74,16 @@ echo "running" > "$STATE_DIR/state" [[ -d "$REPO/.git" ]] || REPO="/opt/mailwolt-installer" cd "$REPO" >/dev/null 2>&1 || true - raw=$(git describe --tags --always --dirty 2>/dev/null || echo "unknown") - # "v" entfernen & Build-Suffixe kappen - norm=$(printf '%s' "$raw" | sed -E 's/^v//; s/-.*$//') + # Tags sicherstellen; Fehler dürfen den Wrapper nicht abbrechen + git rev-parse --is-inside-work-tree >/dev/null 2>&1 && git fetch --tags --quiet origin || true + + # 1) Bevorzugt beschreibbares Tag (z.B. v1.0.29[-dirty]) + raw="$(git describe --tags --dirty --always 2>/dev/null || true)" + # 2) Fallback: kurzer Commit-Hash + [[ -n "$raw" ]] || raw="$(git rev-parse --short HEAD 2>/dev/null || echo "unknown")" + + # Normiert: führendes "v" weg + Build-Suffixe/-dirty kappen + norm="$(printf '%s' "$raw" | sed -E 's/^v//; s/-.*$//')" printf '%s\n' "$raw" > /var/lib/mailwolt/version_raw printf '%s\n' "$norm" > /var/lib/mailwolt/version