From: martin f. krafft <madduck@madduck.net>
Date: Wed, 9 Sep 2009 07:38:37 +0000 (+0200)
Subject: fix resubmit script to add received header even when there was none
X-Git-Url: https://git.madduck.net/etc/mailfilter.git/commitdiff_plain/935de264355e2d9ece92897148936d22c014e68e?ds=sidebyside

fix resubmit script to add received header even when there was none
---

diff --git a/bin/resubmit b/bin/resubmit
index 62d9720..52967a5 100755
--- a/bin/resubmit
+++ b/bin/resubmit
@@ -54,9 +54,9 @@ if [ "$mark_read" -eq 1 ]; then
   PROCMAIL="$PROCMAIL DELIVER_READ=1"
 fi
 
-# execute the date -R only during the eval, not immediately
-FILTER="sed -rne ':b;s/^Received:/&/;tf;p;n;bb' -e ':f;iReceived: by resubmission script; $(date -R)' -e ':e;p;n;be'"
-FILTER="$FILTER | /usr/bin/formail -I'X-Resubmitted: $(date -R)'"
+DATE_R="$(date -R)"
+FILTER="sed -rne ':b;s/^(Received|Date):/&/;tf;p;n;bb' -e ':f;iReceived: by resubmission script; $DATE_R' -e ':e;p;n;be'"
+FILTER="$FILTER | /usr/bin/formail -I'X-Resubmitted: $DATE_R'"
 
 if [ -z "${files:-}" ] && [ $list -eq 0 ]; then
   eval $FILTER | exec $PROCMAIL