fix tickler

[etc/mailfilter.git] / procmail / tickle

diff --git a/procmail/tickle b/procmail/tickle
index caa09bdb644c8ef812764a6c538e3802edadd9a5..5c7d19bc6b15f4aae5ce154ce689cd7998c39c98 100644 (file)
--- a/procmail/tickle
+++ b/procmail/tickle
@@ -1,41 +1,38 @@
 :0
 * ! DEST ?? .
 :0
 * ! DEST ?? .

+* ! TICKLE_DELIVERED ?? .

 * ORIGINAL_TO ?? ^.+@tickle\.madduck\.net$
 * ORIGINAL_TO ?? ^.+@tickle\.madduck\.net$

-* !^X-Tickle-Delivered

 * ORIGINAL_TO ?? ^\/[^@]+
 {
 * ORIGINAL_TO ?? ^\/[^@]+
 {

-  BIN_DATE=/bin/date
-  DELIVERY_TIME=04:20
-  STAMP
+  DAILY_DELIVERY_TIME=04:20
+  JUST_DATE="`$BIN_DATE -d \"$DATE\" +%x`"

 
   :0
   * MATCH ?? ^[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]$
 
   :0
   * MATCH ?? ^[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]$

-  { STAMP="$MATCH (`$BIN_DATE -d @$MATCH +%c`)" }
+  { DELAY="@$MATCH" }

 
   :0 E
   * MATCH ?? ^[0-9]+h$
   * MATCH ?? ^\/[^h]+
 
   :0 E
   * MATCH ?? ^[0-9]+h$
   * MATCH ?? ^\/[^h]+

-  { DATESTR="$DATE + $MATCH hours" }
-
-  JUST_DATE="`$BIN_DATE -d \"$DATE\" +%x`"
+  { DELAY="$DATE + $MATCH hours" }

 
   :0 E
   * MATCH ?? ^[0-9]+m$
   * MATCH ?? ^\/[^m]+
 
   :0 E
   * MATCH ?? ^[0-9]+m$
   * MATCH ?? ^\/[^m]+

-  { DATESTR="$JUST_DATE + $MATCH months $DELIVERY_TIME" }
+  { DELAY="$JUST_DATE + $MATCH months $DAILY_DELIVERY_TIME" }

 
   :0 E
   * MATCH ?? ^[0-9]+w$
   * MATCH ?? ^\/[^w]+
 
   :0 E
   * MATCH ?? ^[0-9]+w$
   * MATCH ?? ^\/[^w]+

-  { DATESTR="$JUST_DATE + $MATCH weeks $DELIVERY_TIME" }
+  { DELAY="$JUST_DATE + $MATCH weeks $DAILY_DELIVERY_TIME" }

 
   :0 E
   * MATCH ?? ^[0-9]+d?$
   * MATCH ?? ^\/[^d]+
 
   :0 E
   * MATCH ?? ^[0-9]+d?$
   * MATCH ?? ^\/[^d]+

-  { DATESTR="$JUST_DATE + $MATCH days $DELIVERY_TIME" }
+  { DELAY="$JUST_DATE + $MATCH days $DAILY_DELIVERY_TIME" }

 
   JUST_DATE
 
   JUST_DATE

-  DELIVERY_TIME
+  DAILY_DELIVERY_TIME

 
   :0 E
   {
 
   :0 E
   {


@@ -44,27 +41,10 @@
     HOST
   }
 
     HOST
   }
 

-  :0
-  * ! STAMP ?? .
-  { STAMP=`$BIN_DATE +'%s (%c)' -d "$DATESTR"` }
-
-  :0
-  * ! STAMP ?? ^[0-9]+ \([A-Za-z ]+ [0-9 :]+\)$
-  {
-    LOG="tickle:      error creating timestamp ($STAMP), using \$now$NL"
-    STAMP="`$BIN_DATE +%s` (ERROR: original stamp '$STAMP' invalid)"
-  }
-
-  :0 E
-  { LOG="tickle:      stamping message $MSGID with $STAMP$NL" }
-

   :0 fw
   :0 fw

-  |$FORMAIL -i "X-Tickle: $STAMP"
-
-  :0
-  { DEST=$TICKLER_QUEUE }
+  |$FORMAIL -i "X-Tickle: $DELAY"

 
 

-  BIN_DATE
+  LOG="tickle:      delaying message until $DELAY$NL"

 }
 
 # vim:ft=procmail
 }
 
 # vim:ft=procmail