proper handling of X-Postponed header

[etc/mailfilter.git] / bin / resubmit

diff --git a/bin/resubmit b/bin/resubmit
index 01990b26bcd9bec127df2ac96ac5c93f9a3dccf1..17888f9b8694c22a979b283b759f5e3d4891cc50 100755 (executable)
--- a/bin/resubmit
+++ b/bin/resubmit
@@ -2,9 +2,16 @@
 set -eu
 
 PROCMAIL=$HOME/.etc/mailfilter/procmail/procmailrc
+FORMAIL="/usr/bin/formail -I'X-Resubmitted: $(date -R)'"
 
-if [ -z "$1" ]; then
-  cat | exec $PROCMAIL
+if [ -z "${1:-}" ]; then
+  eval $FORMAIL | exec $PROCMAIL
 else
-  exec $PROCMAIL < "$1"
+  if [ ! -f "$1" ]; then
+    echo "E: no such file: $1" >&2
+    exit 1
+  fi
+  eval $FORMAIL < "$1" | $PROCMAIL && rm -f "$1"
 fi
+
+exit 0