From b8191d87b4e5c9856db96e03ba90a8ccfa4e9ad3 Mon Sep 17 00:00:00 2001
From: Thomas Preud'homme <thomas.preudhomme@celest.fr>
Date: Mon, 25 Jan 2010 19:20:18 +0100
Subject: [PATCH] [email_account] Allow tabs as separator
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Allow tabs as no-op chars in all files manipulated by email_account
(cyrus.conf, imapd.conf, etc…)
---
 email_account/email_account | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/email_account/email_account b/email_account/email_account
index 6e90460..edce54b 100755
--- a/email_account/email_account
+++ b/email_account/email_account
@@ -152,7 +152,7 @@ test_ready_for_restarts ()
 test_cyrus_admin ()
 {
 	local -
-	cyruser=$(grep -E "^[[:space:]]*admins:" /etc/imapd.conf | cut -d ':' -f 2- | sed -r "s/[[:alnum:]]+@[[:alnum:].]+//g" | tr -d ' ')
+	cyruser=$(grep -E "^[[:blank:]]*admins:" /etc/imapd.conf | cut -d ':' -f 2- | sed -r "s/[[:alnum:]]+@[[:alnum:].]+//g" | tr -d ' ')
 	cyrpwd=$(cat /root/cyrus_main_admin_password)
 	testsaslauthd -u $cyruser -p $cyrpwd > /dev/null || { echo "Error! Password for main cyrus admin has changed but has not been modified in /root/" >&2 && exit 1 ; }
 }
@@ -164,8 +164,8 @@ save_cyrus_state_and_become_cyradm_ready ()
 {
 	local -
 	sed -r -i "s/^(.*cmd=\"imapd.* listen=\")(imap\".*)$/\1localhost:\2/" /etc/cyrus.conf
-	sed -r -i "s/^([[:space:]]*allowplaintext:.*)$/#\1\nallowplaintext: 1/" /etc/imapd.conf
-	sed -r -i "s/^([[:space:]]*virtdomains:.*)$/#\1\nvirtdomains: userid/" /etc/imapd.conf
+	sed -r -i "s/^([[:blank:]]*allowplaintext:.*)$/#\1\nallowplaintext: 1/" /etc/imapd.conf
+	sed -r -i "s/^([[:blank:]]*virtdomains:.*)$/#\1\nvirtdomains: userid/" /etc/imapd.conf
 	invoke-rc.d --quiet cyrus2.2 restart
 	if [ ! $? -eq 0 ]
 	then
@@ -240,16 +240,16 @@ update_virtual_domains ()
 		grep "loginrealms:" /etc/imapd.conf | grep "$emaildomain" > /dev/null
 		if [ ! $? -eq 0 ]
 		then
-			sed -r -i "s/^([[:space:]]*loginrealms): ?(.*)$/\1: $emaildomain \2/" /etc/imapd.conf
+			sed -r -i "s/^([[:blank:]]*loginrealms): ?(.*)$/\1: $emaildomain \2/" /etc/imapd.conf
 		fi
 	fi
-	grep "mydomain[[:space:]]*=" /etc/postfix/main.cf | grep "$emaildomain" > /dev/null
+	grep "mydomain[[:blank:]]*=" /etc/postfix/main.cf | grep "$emaildomain" > /dev/null
 	if [ ! $? -eq 0 ]
 	then
-		grep "virtual_mailbox_domains[[:space:]]*=" /etc/postfix/main.cf | grep "$emaildomain" /dev/null
+		grep "virtual_mailbox_domains[[:blank:]]*=" /etc/postfix/main.cf | grep "$emaildomain" /dev/null
 		if [ ! $? -eq 0 ]
 		then
-			sed -r -i "s/^([[:space:]]*virtual_mailbox_domains[[:space:]]*)= ?(.*)$/\1= $emaildomain \2/" /etc/postfix/main.cf
+			sed -r -i "s/^([[:blank:]]*virtual_mailbox_domains[[:blank:]]*)= ?(.*)$/\1= $emaildomain \2/" /etc/postfix/main.cf
 		fi
 	fi
 }
@@ -274,14 +274,14 @@ echo_with_tabs ()
 update_postfix_email_account ()
 {
 	local -
-	grep "^[[:space:]]*$emailuser@$emaildomain" /etc/postfix/vmailbox > /dev/null
+	grep "^[[:blank:]]*$emailuser@$emaildomain" /etc/postfix/vmailbox > /dev/null
 	if [ ! $? -eq 0 ]
 	then
 		echo_with_tabs "$emailuser@$emaildomain" "whatever" 4 >> /etc/postfix/vmailbox
 	fi
 	if [ ! $# -eq 0 ]
 	then
-		grep "^[[:space:]]*$aliasuser@$aliasdomain" /etc/postfix/vmailbox > /dev/null
+		grep "^[[:blank:]]*$aliasuser@$aliasdomain" /etc/postfix/vmailbox > /dev/null
 		if [ ! $? -eq 0 ]
 		then
 			echo_with_tabs "$aliasuser@$aliasdomain" "whatever" 4 >> /etc/postfix/vmailbox
@@ -294,7 +294,7 @@ update_postfix_email_account ()
 update_email_aliases ()
 {
 	local -
-	grep "$aliasuser@$aliasdomain[[:space:]]+$emailuser@$emaildomain" /etc/postfix/virtual > /dev/null
+	grep "[[:blank:]]*$aliasuser@$aliasdomain[[:blank:]]+$emailuser@$emaildomain" /etc/postfix/virtual > /dev/null
 	if [ ! $? -eq 0 ]
 	then
 		echo_with_tabs "$aliasuser@$aliasdomain" "$emailuser@$emaildomain" 4 >> /etc/postfix/virtual
@@ -363,9 +363,9 @@ restore_cyrus_state ()
 	# we print the line in the pattern space. If from the beginning we
 	# have a non allowplaintext line, then T makes us jump to fail and
 	# print the line in the pattern space (that is the current line).
-	sed -r -n -i "{s/^#([[:space:]]*allowplaintext:.*)$/\1/;t success;T fail;: success;h;n;g;: fail;p}" /etc/imapd.conf
+	sed -r -n -i "{s/^#([[:blank:]]*allowplaintext:.*)$/\1/;t success;T fail;: success;h;n;g;: fail;p}" /etc/imapd.conf
 	# Same as above for virtdomains
-	sed -r -n -i "{s/^#([[:space:]]*virtdomains:.*)$/\1/;t success;T fail;: success;h;n;g;: fail;p}" /etc/imapd.conf
+	sed -r -n -i "{s/^#([[:blank:]]*virtdomains:.*)$/\1/;t success;T fail;: success;h;n;g;: fail;p}" /etc/imapd.conf
 	invoke-rc.d --quiet cyrus2.2 restart
 	if [ ! $? -eq 0 ]
 	then