From 4d9966429c3d0f6b23ef4731a57c5d83873fbcb4 Mon Sep 17 00:00:00 2001 From: boksbc Date: Sat, 25 Oct 2025 14:17:19 +0200 Subject: [PATCH] Dovecot Systax Problem --- scripts/88-update-wrapper.sh | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/scripts/88-update-wrapper.sh b/scripts/88-update-wrapper.sh index b6a3911..5b9e4cf 100644 --- a/scripts/88-update-wrapper.sh +++ b/scripts/88-update-wrapper.sh @@ -70,29 +70,23 @@ echo "running" > "$STATE_DIR/state" # ── Version schreiben (aus App-Repo, Fallback Installer) ───────────────────── if command -v git >/dev/null 2>&1; then - REPO="/var/www/mailwolt" - [[ -d "$REPO/.git" ]] || REPO="/opt/mailwolt-installer" - cd "$REPO" >/dev/null 2>&1 || true + if [ -d /var/www/mailwolt/.git ]; then + cd /var/www/mailwolt >/dev/null 2>&1 || true + elif [ -d /opt/mailwolt-installer/.git ]; then + cd /opt/mailwolt-installer >/dev/null 2>&1 || true + fi - # 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 + raw="$(git describe --tags --always --dirty 2>/dev/null || echo "unknown")" 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 chmod 0644 /var/lib/mailwolt/version_raw /var/lib/mailwolt/version - echo "[i] Version aktualisiert: raw=$raw norm=$norm (Quelle: $REPO)" + echo "[i] Version aktualisiert: raw=$raw norm=$norm (Quelle: $(pwd))" else - printf '%s\n' "unknown" > /var/lib/mailwolt/version_raw - printf '%s\n' "0.0.0" > /var/lib/mailwolt/version + echo "unknown" > /var/lib/mailwolt/version_raw + echo "0.0.0" > /var/lib/mailwolt/version chmod 0644 /var/lib/mailwolt/version_raw /var/lib/mailwolt/version fi