remove verbose output from tnef-filter

[etc/mailfilter.git] / bin / retrain

diff --git a/bin/retrain b/bin/retrain
index 784f17ea262a6ca9853b8fe9373166c8e353e081..315d3294295c6936e03eb87ed1af070c756f3221 100755 (executable)
--- a/bin/retrain
+++ b/bin/retrain
@@ -49,10 +49,12 @@ case "$HAM/$SPAM" in
 esac
 
 if [ -n "$maildir" ]; then
 esac
 
 if [ -n "$maildir" ]; then

-  LOCKFILE="$maildir/.retrain.lock"
+  ME="${0##*/}"
+  LOCKFILE="$maildir/.$ME.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
   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
+    echo "E: another $ME process is already running over that Maildir." >&2
+    trap - 0 1 2 3 4 5 6 7 8 10 11 12 13 14 15

     exit 1
   fi
 
     exit 1
   fi