From 65b74850e29d5b9ba2345dcede3858f4735a9e09 Mon Sep 17 00:00:00 2001
From: Mario Alegre <mario@git.alemor.org>
Date: Tue, 21 Jul 2020 15:28:46 -0400
Subject: [PATCH] made mailsrv mkvirt script test if sieve scripts compile

---
 src/mailsrv/assets/bin/mkvirt | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/mailsrv/assets/bin/mkvirt b/src/mailsrv/assets/bin/mkvirt
index 5c5124b..36fdd86 100755
--- a/src/mailsrv/assets/bin/mkvirt
+++ b/src/mailsrv/assets/bin/mkvirt
@@ -1,8 +1,5 @@
 #!/bin/sh
 
-# fail immediately if any command fails
-set -e
-
 ### Users ###
 
 # copy users db to dovecot config
@@ -26,7 +23,14 @@ postmap aliases
 cd /vol/data/sieve.d
 for user in * ; do
   mkdir -p /vol/mail/${user}
-  chown vmail:vmail /vol/mail/${user}
-  chown vmail:vmail ${user}
+  chown vmail:vmail /vol/mail/${user} ${user}
+  echo "Testing ${user}'s sieve script for compilation errors..."
+  sievec ${user} -d - > /dev/null
+  if [ $? -eq 0 ]; then
+    echo "No errors detected."
+  else
+    echo "Compilation errors detected in ${user}'s sieve script. Please correct any errors and run $(basename $0) again."
+    exit 2
+  fi
   cp -p ${user} /vol/mail/${user}/.dovecot.sieve
 done