X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=scripts%2Fdc-dlvr;h=90aab73b45c716eaaf1e15faa1eff5cb1af2a0f2;hb=352956bcf1933bdaeba631deb4ade7dc7fd754b1;hp=5ebca3fedc23ea1c0eacbe111c64cc8e7ef3cb2e;hpb=749d63840bc1603686954043f2ae6a7acb24a379;p=public-inbox.git
diff --git a/scripts/dc-dlvr b/scripts/dc-dlvr
index 5ebca3fe..90aab73b 100755
--- a/scripts/dc-dlvr
+++ b/scripts/dc-dlvr
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2008-2016 all contributors
+# Copyright (C) 2008-2020 all contributors
# License: GPL-3.0+
# This is installed as /etc/dc-dcvr on my system
# to use with postfix main.cf: mailbox_command = /etc/dc-dlvr "$EXTENSION"
@@ -25,7 +25,8 @@ cat >$CDMSG
$CLAMDSCAN --quiet - <$CDMSG
if test $? -eq 1
then
- exec $DELIVER -m INBOX.spam <$CDMSG
+ $DELIVER -m INBOX.spam <$CDMSG
+ exec rm -f $rm_list
fi
# pre-filter, for infrequently read lists which do their own spam filtering:
@@ -56,14 +57,14 @@ err=$?
set -e
case $err in
-1) $DELIVER -m INBOX.spam < $TMPMSG ;;
+1) $DELIVER -m INBOX.spam <$TMPMSG ;;
*)
# users may override normal delivery and have it go elsewhere
if test -r ~/.dc-dlvr.rc
then
. ~/.dc-dlvr.rc
else
- $DELIVER -m INBOX < $TMPMSG
+ $DELIVER -m INBOX <$TMPMSG
fi
;;
esac