X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/4a3212dc350e8b9584823bf603e3eb71a7528cae..741f9a9bbeb999f22417f0a30696165613684d4d:/procmail/deliver

diff --git a/procmail/deliver b/procmail/deliver
index 7a7b9a9..ca6bef4 100644
--- a/procmail/deliver
+++ b/procmail/deliver
@@ -1,14 +1,27 @@
 :0
-*$ $DEST
-{
-  LOG="deliver:     delivering message $MSGID to $DEST$NL"
-  :0
-  $DEST
-}
+* ! DEST ?? .
+{ DEST=/ }
+
+:0
+* DEST ?? .+[^/]$
+{ DEST="$DEST/" }
+
+:0
+*$ DEST ?? ^$BASE/\/.+
+{ DEST="$MATCH" }
+
+:0
+*$ DEST ?? ^\.
+{ }
 
 :0 E
+{ DEST=".$DEST" }
+
+:0
 {
-  LOG="deliver:     delivering message $MSGID to default destination$NL"
+  LOG="deliver:     delivering message $MSGID to $DEST$NL"
+  TRAP="$TRAP; echo \"delivered:   \$DESTFILE\" >> '$THISLOGFILE'"
+
   :0
-  $DEFAULT
+  $BASE/$DEST
 }