X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/ec33cde8f8ecb3f68c805ce48b4d62838647a739..bd01be7c73f0cb65d39bee92874a8d1b2957c852:/procmail/deliver

diff --git a/procmail/deliver b/procmail/deliver
index 928d52c..168ccdf 100644
--- a/procmail/deliver
+++ b/procmail/deliver
@@ -1,23 +1,26 @@
-VERBOSE=yes
 :0
-*$ $DEST
-{
-  :0
-  * DEST ?? .+[^/]$
-  { DEST="$DEST/" }
+* ! DEST ?? .
+{ DEST=/ }
 
-  :0 E
-  *$ DEST ?? ^\.
-  { DEST="$BASE/$DEST" }
+:0
+* DEST ?? .+[^/]$
+{ DEST="$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