X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/097c75254f91531513cd2c9a43749e46b8d27e11..74545177e87a6681a2170291151a6045dc976b3a:/procmail/deliver

diff --git a/procmail/deliver b/procmail/deliver
index c3188ff..ca6bef4 100644
--- a/procmail/deliver
+++ b/procmail/deliver
@@ -1,30 +1,27 @@
 :0
-* DEST ?? .
-{
-  :0
-  * DEST ?? .+[^/]$
-  { DEST="$DEST/" }
-
-  :0
-  *$ DEST ?? ^$BASE/\/.+
-  { DEST="$MATCH" }
+* ! DEST ?? .
+{ DEST=/ }
 
-  :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
+{ 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
 }