diff options
author | Jonas Smedegaard <dr@jones.dk> | 2006-08-20 20:36:04 +0000 |
---|---|---|
committer | Jonas Smedegaard <dr@jones.dk> | 2006-08-20 20:36:04 +0000 |
commit | 05dbeac2a51c997f4e8837ce5597829d46e59dff (patch) | |
tree | 61dde3f34dd5a38132317c5457bf20b4c5b30a72 | |
parent | b87b92a1695f2ca7a77ac8b1bcf7c440c919aaad (diff) |
Use $HOME unexpanded. Use grep -x (not egrep).
-rwxr-xr-x | localmb2md | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -3,7 +3,7 @@ # /usr/local/sbin/adduser.local # Copyright 2005-2006 Jonas Smedegaard <dr@jones.dk> # -# $Id: localmb2md,v 1.9 2006-08-06 19:10:10 jonas Exp $ +# $Id: localmb2md,v 1.10 2006-08-20 20:36:04 jonas Exp $ # # Convert user account from mailboxes below /var/mail/ and ~/mail/ to # maildirs below ~/Maildir/ . @@ -43,12 +43,12 @@ done # Bail out if custom procmailrc is in the way if [ -n "$mkprocmailrc" ] && [ -f ~/.procmailrc ]; then - if egrep -v -q '^DEFAULT=\$HOME/Maildir/$' ~/.procmailrc; then + if ! grep -q -x 'DEFAULT=\$HOME/Maildir/' ~/.procmailrc; then cat <<EOF ERROR: non-Maildir-aware ~/.procmailrc exists already. Please edit manually to include the following line: - DEFAULT=$HOME/Maildir/ + DEFAULT=\$HOME/Maildir/ Make sure other rules use Maildirs too, if needed. EOF |