filter cron messages from other domains too

[etc/mailfilter.git] / bin / retrain

diff --git a/bin/retrain b/bin/retrain
index fa7a244057db1dc3ff11d53bfc4cad18b5efcb34..784f17ea262a6ca9853b8fe9373166c8e353e081 100755 (executable)
--- a/bin/retrain
+++ b/bin/retrain
@@ -10,18 +10,22 @@ PAUSETIME=10
 
 HAM=0
 SPAM=0
 
 HAM=0
 SPAM=0

-MAILDIR=

 
 

+maildir=
+files=

 for i in "$@"; do
   case "$i" in
     --ham) HAM=1;;
     --spam) SPAM=1;;
     *)
 for i in "$@"; do
   case "$i" in
     --ham) HAM=1;;
     --spam) SPAM=1;;
     *)

-      if [ -n "$MAILDIR" ]; then
-        echo "E: Maildir already specified: $i" >&2
-        exit 1
+      if [ -f "$i" ] && [ -r "$i" ]; then
+        files="$files $i"

       elif [ -d "$i"/cur ] && [ -d "$i"/new ] && [ -d "$i"/tmp ]; then
       elif [ -d "$i"/cur ] && [ -d "$i"/new ] && [ -d "$i"/tmp ]; then

-        MAILDIR="$i"
+        if [ -n "$maildir" ]; then
+          echo "E: Maildir already specified: $i" >&2
+          exit 1
+        fi
+        maildir="$i"

       else
         echo "E: unknown argument: $i" >&2
         exit 255
       else
         echo "E: unknown argument: $i" >&2
         exit 255


@@ -44,23 +48,33 @@ case "$HAM/$SPAM" in
   1/0) ARG=--ham;;
 esac
 
   1/0) ARG=--ham;;
 esac
 

-LOCKFILE="$MAILDIR/.retrain.lock"
-trap "rm -f $LOCKFILE" 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 retrain process is already running over that Maildir." >&2
-  exit 1
+if [ -n "$maildir" ]; then
+  LOCKFILE="$maildir/.retrain.lock"
+  trap "rm -f $LOCKFILE" 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 retrain process is already running over that Maildir." >&2
+    exit 1
+  fi
+
+  files="$files $(find $MAILDIR/cur $MAILDIR/new -type f)"

 fi
 
 fi
 

-find $MAILDIR/cur $MAILDIR/new -type f | while read msg; do
+for msg in $files; 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
 done
 
   esac
   rm -f "$msg"
   sleep $PAUSETIME
 done
 

-rm -f "$LOCKFILE"
-trap - 1 2 3 4 5 6 7 8 10 11 12 13 14 15
+if [ -n "${LOCKFILE:-}" ]; then
+  rm -f "$LOCKFILE"
+  trap - 1 2 3 4 5 6 7 8 10 11 12 13 14 15
+fi

 
 exit 0
 
 exit 0