more robust retraining with resubmission

diff --git a/bin/resubmit b/bin/resubmit
index 63f8a029eb43e83195980123517305417e5e3084..8405e772f15b51c910dc415616811c10eaf9add0 100755 (executable)
--- a/bin/resubmit
+++ b/bin/resubmit
@@ -3,7 +3,7 @@ set -eu
 
 PROCMAIL=$HOME/.etc/mailfilter/procmail/procmailrc
 
 
 PROCMAIL=$HOME/.etc/mailfilter/procmail/procmailrc
 

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

   cat | exec $PROCMAIL
 else
   $PROCMAIL < "$1" && rm -f "$1"
   cat | exec $PROCMAIL
 else
   $PROCMAIL < "$1" && rm -f "$1"

diff --git a/bin/retrain b/bin/retrain
index fa7a244057db1dc3ff11d53bfc4cad18b5efcb34..b1ccca172cee26d35c754ff8e32b5fb100fa146f 100755 (executable)
--- a/bin/retrain
+++ b/bin/retrain
@@ -55,6 +55,10 @@ find $MAILDIR/cur $MAILDIR/new -type f | while read msg; do
   $NICE ${0%/*}/train $ARG "$msg" | $RESUBMIT || ret=$?
   case "${ret:-0}" in
     0|75) :;;
   $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
   esac
   rm -f "$msg"
   sleep $PAUSETIME