do not remove lockfile after not acquiring it

diff --git a/bin/release-delayed-messages b/bin/release-delayed-messages
index cdb6da4198e524e54436e14af3848df1b8b03a8e..73c6b3b349d98d3d1448495b461306907430d54d 100755 (executable)
--- a/bin/release-delayed-messages
+++ b/bin/release-delayed-messages
@@ -11,6 +11,7 @@ LOCKFILE="$VAR/.$ME.lock"
 trap "rm -f $LOCKFILE" 0 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 $ME process is already running over that Maildir." >&2
 trap "rm -f $LOCKFILE" 0 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 $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
 

diff --git a/bin/resubmit-postponed-messages b/bin/resubmit-postponed-messages
index df5663e33dbf26cc4dcb4efa47e26aa4e3f19a82..6846bde1161c6211ca6b1099e9fcff2b13b8eb88 100755 (executable)
--- a/bin/resubmit-postponed-messages
+++ b/bin/resubmit-postponed-messages
@@ -12,6 +12,7 @@ LOCKFILE="$VAR/.$ME.lock"
 trap "rm -f $LOCKFILE" 0 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 $ME process is already running over that Maildir." >&2
 trap "rm -f $LOCKFILE" 0 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 $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
 

diff --git a/bin/retrain b/bin/retrain
index e7acbea8a15bb6176d491757088c0a8def6462b9..315d3294295c6936e03eb87ed1af070c756f3221 100755 (executable)
--- a/bin/retrain
+++ b/bin/retrain
@@ -54,6 +54,7 @@ if [ -n "$maildir" ]; 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 $ME process is already running over that Maildir." >&2
   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 $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
 

diff --git a/bin/send-outgoing b/bin/send-outgoing
index 1d5f80007829cd974cc813af4b95bc96ad7a0162..2aa2381f2e471bbd82d4cf022d8459e98ec69610 100755 (executable)
--- a/bin/send-outgoing
+++ b/bin/send-outgoing
@@ -12,6 +12,7 @@ LOCKFILE="$OUTBOX/.$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
   echo "E: another $ME process is already running over that Maildir." >&2
 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 $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