From: Frank Brehm <frank@brehm-online.com>
Date: Tue, 15 Feb 2022 10:48:58 +0000 (+0100)
Subject: Fixing debug output in migrating sieve
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=3d5961768e1be251fd88b1142feff9b871200e71;p=pixelpark%2Fldap-migration.git

Fixing debug output in migrating sieve
---

diff --git a/migrate-sieve b/migrate-sieve
index b1e9277..ceaf0d0 100755
--- a/migrate-sieve
+++ b/migrate-sieve
@@ -7,7 +7,7 @@ VERBOSE="n"
 DEBUG="n"
 QUIET='n'
 SIMULATE='n'
-FORCE="y"
+FORCE="n"
 
 VERSION="4.1"
 
@@ -632,7 +632,11 @@ migrate_entry() {
     info "Compiling '${CYAN}${dovecot_sieve_file}${NORMAL}' ..."
     debug "Executing: sievec \"${dovecot_sieve_file}\" || true"
     if [[ "${SIMULATE}" != "y" ]] ; then
-        sievec "${dovecot_sieve_file}" 2>&1 | grep -viw debug || true
+        if [[ "${VERBOSE}" == "y" ]] ; then
+            sievec "${dovecot_sieve_file}" || true
+        else
+            sievec "${dovecot_sieve_file}" 2>&1 | grep -viw debug || true
+        fi
     fi
     if [[ -f "${compiled_sieve}" ]] ; then
         CHOWN "${VMAIL_USER}:${VMAIL_GROUP}" "${compiled_sieve}"