fix skips and add billmonk

[etc/mailfilter.git] / procmail / deliver

diff --git a/procmail/deliver b/procmail/deliver
index 168ccdf78796a5b56c15e5ca481775dce2589381..ca6bef4477ee9da82034e8cc113e8ddbbb7c7e9e 100644 (file)
--- a/procmail/deliver
+++ b/procmail/deliver
@@ -17,10 +17,11 @@
 :0 E
 { DEST=".$DEST" }
 
-TRAP="DEST=\"\${LASTFOLDER#$BASE/}\";
-      echo \"delivered:   \$DEST\" >> '$THISLOGFILE';
-      $TRAP"
-
-LOG="deliver:     delivering message $MSGID to $DEST$NL"
 :0
-$BASE/$DEST
+{
+  LOG="deliver:     delivering message $MSGID to $DEST$NL"
+  TRAP="$TRAP; echo \"delivered:   \$DESTFILE\" >> '$THISLOGFILE'"
+
+  :0
+  $BASE/$DEST
+}