From: martin f. krafft <madduck@madduck.net>
Date: Sun, 23 Sep 2007 18:16:58 +0000 (+0200)
Subject: move DESTFILE variable back to logging
X-Git-Url: https://git.madduck.net/etc/mailfilter.git/commitdiff_plain/4005966fcc096aa73e6bf3d7daa9adedee211e63?ds=sidebyside

move DESTFILE variable back to logging
---

diff --git a/procmail/deliver b/procmail/deliver
index 168ccdf..4417af6 100644
--- a/procmail/deliver
+++ b/procmail/deliver
@@ -17,9 +17,7 @@
 :0 E
 { DEST=".$DEST" }
 
-TRAP="DEST=\"\${LASTFOLDER#$BASE/}\";
-      echo \"delivered:   \$DEST\" >> '$THISLOGFILE';
-      $TRAP"
+TRAP="$TRAP; echo \"delivered:   \$DESTFILE\" >> '$THISLOGFILE'"
 
 LOG="deliver:     delivering message $MSGID to $DEST$NL"
 :0
diff --git a/procmail/logging b/procmail/logging
index 38b901a..a606b2a 100644
--- a/procmail/logging
+++ b/procmail/logging
@@ -20,7 +20,8 @@ from:        $FROM
 original-to: $ORIGINAL_TO
 subject:     $SUBJECT$NL"
 
-TRAP="echo >> '$THISLOGFILE';
+TRAP="DESTFILE=\"\${LASTFOLDER#$BASE/}\";
+      echo >> '$THISLOGFILE';
       egrep -v '^XX(procmail:)?[[:space:]\"]' '$THISLOGFILE' >> $MASTERLOGFILE"
 
 #VERBOSE=yes