improved lock handling

[etc/offlineimap.git] / .bin / offlineimap

diff --git a/.bin/offlineimap b/.bin/offlineimap
index c9f8b2a0ae9b6dd39317bb883dc37c058364edc4..ae82806c5753b37d08ee2a94fcd47dd96cfa3395 100755 (executable)
--- a/.bin/offlineimap
+++ b/.bin/offlineimap
@@ -1,15 +1,27 @@
 #!/bin/sh
 set -eu
 
+[ "${1:-}" = -q ] && exec >/dev/null
+
+VAR=$HOME/.var/offlineimap
+LOCKFILE="$VAR/.cron.lock"
+trapfn() { rm -f "$LOCKFILE"; trap - 0 1 2 3 4 5 6 7 8 10 11 12 13 14 15; }
+trap trapfn 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: offlineimap is already running." >&2
+  exit 1
+fi
+
+trap trapfn 0
+
 if ! test -t 0; then
-  echo Renicing because we are not run interactively… >&2
+  echo Renicing because we are not run interactively…
   renice 20 -p $$ >/dev/null
-  ionice -c2 -n7 -p $$
+  ionice -c3 -p $$
 fi
 
 ret=0
-/usr/bin/offlineimap -o "$@" || exit $?
+/usr/bin/offlineimap "$@" || ret=$?
 
-if [ -x "$(command -v notmuch)" ]; then
-  notmuch new || exit $?
-fi
+trapfn
+exit $ret