X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/67e1e81d0e60d4154ae0d2a34ee0e51a2a5f89c9..0175d75ca8987019f99c927f3749f47abc6f7e12:/procmail/deliver

diff --git a/procmail/deliver b/procmail/deliver
index e3db030..e299423 100644
--- a/procmail/deliver
+++ b/procmail/deliver
@@ -1,30 +1,33 @@
-VERBOSE=yes
 :0
-*$ $DEST
+*$ DEST ?? ^$NULL$
 {
-  :0
-  * DEST ?? .+[^/]$
-  { DEST="$DEST/" }
+  LOG="deliver:     sending message $MSGID to $DEST$NL"
 
   :0
-  *$ DEST ?? ^$BASE/\.
-  { }
+  $NULL
+}
 
-  :0 E
-  *$ DEST ?? ^\.
-  { DEST="$BASE/$DEST" }
+:0
+* ! DEST ?? .
+{ DEST=/ }
 
-  :0 E
-  { DEST="$BASE/.$DEST" }
+:0
+* DEST ?? .+[^/]$
+{ DEST="$DEST/" }
 
-  LOG="deliver:     delivering message $MSGID to $DEST$NL"
-  :0
-  $DEST
-}
+:0
+*$ DEST ?? ^$BASE/\/.+
+{ DEST="$MATCH" }
+
+:0
+*$ ! DEST ?? ^\.
+{ DEST=".$DEST" }
 
-:0 E
+: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
 }