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

diff --git a/procmail/deliver b/procmail/deliver
index e3db030..168ccdf 100644
--- a/procmail/deliver
+++ b/procmail/deliver
@@ -1,30 +1,26 @@
-VERBOSE=yes
 :0
-*$ $DEST
-{
-  :0
-  * DEST ?? .+[^/]$
-  { DEST="$DEST/" }
+* ! DEST ?? .
+{ DEST=/ }
 
-  :0
-  *$ DEST ?? ^$BASE/\.
-  { }
-
-  :0 E
-  *$ DEST ?? ^\.
-  { DEST="$BASE/$DEST" }
+:0
+* DEST ?? .+[^/]$
+{ DEST="$DEST/" }
 
-  :0 E
-  { DEST="$BASE/.$DEST" }
+:0
+*$ DEST ?? ^$BASE/\/.+
+{ DEST="$MATCH" }
 
-  LOG="deliver:     delivering message $MSGID to $DEST$NL"
-  :0
-  $DEST
-}
+:0
+*$ DEST ?? ^\.
+{ }
 
 :0 E
-{
-  LOG="deliver:     delivering message $MSGID to default destination$NL"
-  :0
-  $DEFAULT
-}
+{ DEST=".$DEST" }
+
+TRAP="DEST=\"\${LASTFOLDER#$BASE/}\";
+      echo \"delivered:   \$DEST\" >> '$THISLOGFILE';
+      $TRAP"
+
+LOG="deliver:     delivering message $MSGID to $DEST$NL"
+:0
+$BASE/$DEST