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

[etc/mailfilter.git] / bin / release-delayed-messages

diff --git a/bin/release-delayed-messages b/bin/release-delayed-messages
index fd381d37fd550112bd4d4922908feab2799085a2..73c6b3b349d98d3d1448495b461306907430d54d 100755 (executable)
--- a/bin/release-delayed-messages
+++ b/bin/release-delayed-messages
@@ -1,12 +1,19 @@
 #!/bin/sh
 set -eu
 
 #!/bin/sh
 set -eu
 

-MAILDIR=$HOME/.maildir
+DELAYED_QUEUE=$HOME/.maildir/.delayed

 
 

-SQLITE=/usr/bin/sqlite3
-DELAYED_QUEUE_DB=$HOME/.var/procmail/delayed-queue.sqlite
+DIR="${0%/*}"

 
 

-QUERY="update messages set release_ts = strftime('%s', 'now') where filename like '.delayed/%'"
+VAR=$HOME/.var/procmail
+ME="${0##*/}"
+LOCKFILE="$VAR/.$ME.lock"
+trap "rm -f $LOCKFILE" 0 1 2 3 4 5 6 7 8 10 11 12 13 14 15
+if ! lockfile -0 -r0 -l 3600 "$LOCKFILE" 2>/dev/null; then
+  echo "E: another $ME process is already running over that Maildir." >&2
+  trap - 0 1 2 3 4 5 6 7 8 10 11 12 13 14 15
+  exit 1
+fi

 
 

-$SQLITE $DELAYED_QUEUE_DB "$QUERY"
-exec $HOME/.etc/mailfilter/bin/process-delayed-queue
+"$DIR"/list-postponed-messages --all "$DELAYED_QUEUE" \
+  | exec xargs "$DIR"/resubmit --list