reuse BIN_DATE variable and slight reorg

diff --git a/procmail/defines b/procmail/defines
index af431c1d0aad5394d49aaa9e15a1a0a62b88f4ce..464cea3720cf6bb525ee96b8df8832f244bdd9e9 100644 (file)
--- a/procmail/defines
+++ b/procmail/defines
@@ -25,6 +25,7 @@ PROCMAIL="$NICE /usr/bin/procmail -p $PMDIR/procmailrc"
 FORMAIL="$NICE /usr/bin/formail -f"
 EGREP="$NICE /bin/egrep"
 SED="$NICE /bin/sed"
+BIN_DATE="/bin/date"
 DELIVER="$NICE /usr/lib/dovecot/deliver"
 
 CRM114="$NICE /usr/share/crm114/mailreaver.crm -u $MAILFILT/crm114/"
@@ -78,7 +79,10 @@ TICKLER_QUEUE=$BASE/.tickler/
 DISCARD=$BASE/.discard/
 #DISCARD="'|$DELIVER -m BASE.discard'"
 
-OURDATE="`date +'%s %Y.%m.%d.%H.%M.%N %a, %d %b %Y %T %z'`"
+DELAY_NEXT_WEEKEND='next sunday 30 hours ago' # fri night, 18:00
+DELAY_TONIGHT='tomorrow 00:00 6 hours ago' # tonight at 18:00
+
+OURDATE="`$BIN_DATE +'%s %Y.%m.%d.%H.%M.%N %a, %d %b %Y %T %z'`"
 :0
 *$ OURDATE ?? ^\/${RE_NOT_SPACE}+
 { OURDATE_TS="$MATCH" }
@@ -89,9 +93,6 @@ OURDATE="`date +'%s %Y.%m.%d.%H.%M.%N %a, %d %b %Y %T %z'`"
 *$ OURDATE ?? ^[0-9]+${RE_SPACE}+[0-9.]+${RE_SPACE}+\/${RE_NOT_SPACE}+
 { OURDATE="$MATCH" }
 
-DELAY_NEXT_WEEKEND='next monday 54 hours ago' # fri night, 18:00 CET
-DELAY_TONIGHT='tomorrow 00:00 6 hours ago' # tonight at 18:00 CET
-
 ### variables from the message
 
 ### local recipient data

diff --git a/procmail/delay-delivery b/procmail/delay-delivery
index 634f70f84f5dbe6ea72fd3c075d9d01fa672776d..3410dcfa9c647adc463e8f925cac10b6ef408df9 100644 (file)
--- a/procmail/delay-delivery
+++ b/procmail/delay-delivery
@@ -10,14 +10,15 @@
   { DELAY="now + $DELAY" }
 
   #TODO: for tickling, use header date
-  RELEASE="`date -d \"$DELAY\" +'%s %c'`"
+  RELEASE="`$BIN_DATE -d \"$DELAY\" +'%s %c'`"
+
   :0
   *$ RELEASE ?? ^\/${RE_NOT_SPACE}+
   { RELEASE_TS=$MATCH }
 
   :0
-  *$  $RELEASE_TS^0
-  *$ -$OURDATE_TS^0
+  *$  $RELEASE_TS ^0
+  *$ -$OURDATE_TS ^0
   {
     :0
     *$ RELEASE ?? ^[0-9]+${RE_SPACE}+\/.+

diff --git a/procmail/tickle b/procmail/tickle
index 157ed9db23de8f08b109d7d73a770432d4d64255..7aa4db82831be02c759bd57b11104cfc5be8632b 100644 (file)
--- a/procmail/tickle
+++ b/procmail/tickle
@@ -4,7 +4,6 @@
 * ORIGINAL_TO ?? ^.+@tickle\.madduck\.net$
 * ORIGINAL_TO ?? ^\/[^@]+
 {
-  BIN_DATE=/bin/date
   DELIVERY_TIME=04:20
   STAMP
 
@@ -63,8 +62,6 @@
 
   :0
   { DEST=$TICKLER_QUEUE }
-
-  BIN_DATE
 }
 
 # vim:ft=procmail