fix resubmit script

[etc/mailfilter.git] / bin / resubmit

diff --git a/bin/resubmit b/bin/resubmit
index 8405e772f15b51c910dc415616811c10eaf9add0..2e4896df955179761ce59436861af5a544844769 100755 (executable)
--- a/bin/resubmit
+++ b/bin/resubmit
@@ -2,11 +2,16 @@
 set -eu
 
 PROCMAIL=$HOME/.etc/mailfilter/procmail/procmailrc
 set -eu
 
 PROCMAIL=$HOME/.etc/mailfilter/procmail/procmailrc

+FORMAIL="/usr/bin/formail -I'X-Resubmitted: $(date -R)'"

 
 if [ -z "${1:-}" ]; then
 
 if [ -z "${1:-}" ]; then

-  cat | exec $PROCMAIL
+  $FORMAIL | exec $PROCMAIL

 else
 else

-  $PROCMAIL < "$1" && rm -f "$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
 fi
 
 exit 0