X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/af3a08cb6bc9e3a37e224613170ff502713fa8ac..2d2edcef6c1cd1a161107db0cd9f8995c7f17515:/procmail/to-gmail

diff --git a/procmail/to-gmail b/procmail/to-gmail
index 21ab43e..4996d91 100644
--- a/procmail/to-gmail
+++ b/procmail/to-gmail
@@ -1,18 +1,23 @@
 :0
 * ORIG_DOMAIN ?? ^(mass|r2e)\.madduck\.net$
-* !^X-Mailer: swaks
 {
   :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" }
 }