]> git.madduck.net Git - etc/mailfilter.git/blobdiff - bin/retrain

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

improve vacation message handling
[etc/mailfilter.git] / bin / retrain
index 784f17ea262a6ca9853b8fe9373166c8e353e081..315d3294295c6936e03eb87ed1af070c756f3221 100755 (executable)
@@ -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