X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/954a6eaaf93dd99b893b463583f79977e6b7a12c..0f4bcee75353935ff9bc605f7e0b31d12e302605:/procmail/deliver

diff --git a/procmail/deliver b/procmail/deliver
index c3188ff..5a4f355 100644
--- a/procmail/deliver
+++ b/procmail/deliver
@@ -1,30 +1,26 @@
 :0
-* DEST ?? .
-{
-  :0
-  * DEST ?? .+[^/]$
-  { DEST="$DEST/" }
+* ! DEST ?? .
+{ DEST="$DEFAULT" }
 
-  :0
-  *$ DEST ?? ^$BASE/\/.+
-  { DEST="$MATCH" }
-
-  :0
-  *$ DEST ?? ^\.
-  { }
+:0
+* DEST ?? .+[^/]$
+{ DEST="$DEST/" }
 
-  :0 E
-  { DEST=".$DEST" }
+:0
+*$ DEST ?? ^$BASE/\/.+
+{ DEST="$MATCH" }
 
-  LOG="deliver:     delivering message $MSGID to $DEST$NL"
-  DEST="$BASE/$DEST"
-  :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