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

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:

enable strace while we investigate #648195
[etc/offlineimap.git] / .bin / offlineimap
index 7e439d4ca623cd583e4a8d63ce433d676203b314..01456962ddf034fe4c9ec7ba37df166f64478228 100755 (executable)
@@ -5,12 +5,15 @@ set -eu
 
 VAR=$HOME/.var/offlineimap
 LOCKFILE="$VAR/.cron.lock"
 
 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
+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
 
 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…
   renice 20 -p $$ >/dev/null
 if ! test -t 0; then
   echo Renicing because we are not run interactively…
   renice 20 -p $$ >/dev/null
@@ -18,8 +21,7 @@ if ! test -t 0; then
 fi
 
 ret=0
 fi
 
 ret=0
-/usr/bin/offlineimap -o "$@" || exit $?
+strace -tfo /tmp/offlineimap.strace /usr/bin/offlineimap "$@" || ret=$?
 
 
-if [ -x "$(command -v notmuch)" ]; then
-  notmuch new || exit $?
-fi
+trapfn
+exit $ret