From 62f57b7545eedf6a781efb2f5269b0a38ef2cd4c Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Mon, 21 Apr 2014 00:18:33 +0000 Subject: scripts/dc-dlvr: allow exiting from ~/.dc-dlvr.pre The ~/.dc-dlvr.pre script for my public-inbox user does this. --- scripts/dc-dlvr | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'scripts/dc-dlvr') diff --git a/scripts/dc-dlvr b/scripts/dc-dlvr index 68123f84..ca64505c 100755 --- a/scripts/dc-dlvr +++ b/scripts/dc-dlvr @@ -1,6 +1,7 @@ #!/bin/sh # Copyright (C) 2008-2013, Eric Wong # License: GPLv3 or later +# This is installed as /etc/dc-dcvr on my system # to use with postfix main.cf: mailbox_command = /etc/dc-dlvr "$EXTENSION" DELIVER=/usr/lib/dovecot/deliver @@ -11,7 +12,7 @@ catchall) exec $DELIVER ;; esac # change if your spamc/spamd listens elsewhere -spamc='spamc -U /run/spamd.sock' +spamc='spamc' # allow plus addressing to train spam filters, $1 is the $EXTENSION # which may be "trainspam" or "trainham". Only allow spam training @@ -30,11 +31,14 @@ then set -e cat > $TMPMSG DEFAULT_INBOX=$(. ~/.dc-dlvr.pre) - if test xINBOX != x"$DEFAULT_INBOX" - then + case $DEFAULT_INBOX in + '') exec rm -f $rm_list ;; + INBOX) ;; # do nothing + *) $DELIVER -m $DEFAULT_INBOX < $TMPMSG exec rm -f $rm_list - fi + ;; + esac PREMSG=$(mktemp -t dc-dlvr.orig.$USER.XXXXXX || exit 1) rm_list="$rm_list $PREMSG" set +e -- cgit v1.2.3-24-ge0c7