move DESTFILE variable back to logging

diff --git a/procmail/deliver b/procmail/deliver
index 168ccdf78796a5b56c15e5ca481775dce2589381..4417af67a3ee44a97f39fbce9bd17fc19959cea8 100644 (file)
--- a/procmail/deliver
+++ b/procmail/deliver
@@ -17,9 +17,7 @@
 :0 E
 { DEST=".$DEST" }
 
 :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
 
 LOG="deliver:     delivering message $MSGID to $DEST$NL"
 :0

diff --git a/procmail/logging b/procmail/logging
index 38b901a9edf013fd4beb674d82ce92644ce8c2cd..a606b2a5b1df442e77b5096c698cf6faa3130db6 100644 (file)
--- a/procmail/logging
+++ b/procmail/logging
@@ -20,7 +20,8 @@ from:        $FROM
 original-to: $ORIGINAL_TO
 subject:     $SUBJECT$NL"
 
 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
       egrep -v '^XX(procmail:)?[[:space:]\"]' '$THISLOGFILE' >> $MASTERLOGFILE"
 
 #VERBOSE=yes