Merge branch 'master' of ssh://git.madduck.net/srv/git/git.madduck.net/pub/etc/mailfilter

[etc/mailfilter.git] / bin / retrain

diff --git a/bin/retrain b/bin/retrain
index a95fbc92d3600750da246af18820e23b52500724..b1ccca172cee26d35c754ff8e32b5fb100fa146f 100755 (executable)
--- a/bin/retrain
+++ b/bin/retrain
@@ -1,8 +1,10 @@
 #!/bin/sh
 set -eu
 
-NICE='nice -20'
-PROCMAIL="$HOME/.etc/mailfilter/procmail/procmailrc"
+NICE='/usr/bin/nice -20'
+NICE=''
+
+RESUBMIT="$NICE $HOME/.etc/mailfilter/bin/resubmit"
 
 PAUSETIME=10
 
@@ -50,9 +52,13 @@ if ! lockfile -0 -r0 -l 3600 "$LOCKFILE" 2>/dev/null; then
 fi
 
 find $MAILDIR/cur $MAILDIR/new -type f | while read msg; do
-  $NICE ${0%/*}/train $ARG "$msg" | $PROCMAIL || ret=$?
+  $NICE ${0%/*}/train $ARG "$msg" | $RESUBMIT || ret=$?
   case "${ret:-0}" in
     0|75) :;;
+    *)
+      echo "E: resubmission returned with exit code $ret" >&2
+      continue
+      ;;
   esac
   rm -f "$msg"
   sleep $PAUSETIME