do not pass -o to oi from wrapper

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

diff --git a/.bin/offlineimap b/.bin/offlineimap
index 789fbe4c7a996fa05c09527875e8267028a2e2f7..d440e248250aef13ae3fccf040f13c907783aff4 100755 (executable)
--- a/.bin/offlineimap
+++ b/.bin/offlineimap
@@ -1,14 +1,24 @@
 #!/bin/sh
 set -eu
 
 #!/bin/sh
 set -eu
 

+[ "${1:-}" = -q ] && exec >/dev/null
+
+VAR=$HOME/.var/offlineimap
+LOCKFILE="$VAR/.cron.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: offlineimap is already running." >&2
+  exit 1
+fi
+

 if ! test -t 0; then
 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 -c3 -p $$
 fi
 
 ret=0
   renice 20 -p $$ >/dev/null
   ionice -c3 -p $$
 fi
 
 ret=0

-/usr/bin/offlineimap -o "$@" || exit $?
+/usr/bin/offlineimap "$@" || exit $?

 
 if [ -x "$(command -v notmuch)" ]; then
   notmuch new || exit $?
 
 if [ -x "$(command -v notmuch)" ]; then
   notmuch new || exit $?