X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/7f96c594ec0bc35681ba72e4f8eaae970aecfab8..2d11140ff2b49d551a57ced137d0dce809661f42:/procmail/to-gmail

diff --git a/procmail/to-gmail b/procmail/to-gmail
index ab05e40..4996d91 100644
--- a/procmail/to-gmail
+++ b/procmail/to-gmail
@@ -1,18 +1,23 @@
-:0 c
+:0
 * ORIG_DOMAIN ?? ^(mass|r2e)\.madduck\.net$
-* !^X-Mailer: swaks
 {
-  :0
+  :0 c
   *$ ! $MSG_DEJAVU
+  * ! MSG_TEST ?? .
   {
-    LOG="gmail:       archiving message $MSGID with gmail$NL"
+    LOG="gmail:       archiving message $MSGID$NL"
     SENDMAILFLAGS="$SENDMAILFLAGS -f $ID"
-    TRAP=""
+    TRAP
 
     :0
-    ! martin.krafft@gmail.com
+    ! martin.krafft+archive@gmail.com
   }
 
   :0 E
-  { LOG="gmail:       not archiving message resubmitted message with gmail$NL" }
+  * MSG_TEST ?? .
+  { LOG="gmail:       not archiving test message$NL" }
+
+  :0 E
+  *$ $MSG_DEJAVU
+  { LOG="gmail:       not archiving resubmitted message$NL" }
 }