no longer need wrapper as account handling/locking works now

diff --git a/.bin/offlineimap b/.bin/offlineimap
deleted file mode 100755 (executable)
index 9d68f91..0000000
--- a/.bin/offlineimap
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/sh
-set -eu
-
-VAR=$HOME/.var/offlineimap
-DEFAULT_ACCOUNT=madduck.net
-
-opts=
-accounts=
-quiet=
-for opt in "$@"; do
-  case "$opt" in
-    --quiet)
-      opts="${opts:+$opts }-uQuiet -l/dev/null"
-      quiet=1
-      ;;
-    -a) continue;;
-    -*) opts="${opts:+$opts }$opt";;
-    *) accounts="${accounts:+$accounts }$opt";;
-  esac
-done
-
-say() { [ -n "$quiet" ] || echo >&2 "$@"; }
-err() { echo >&2 "$@"; }
-
-if [ -z "$accounts" ]; then
-  accounts=$DEFAULT_ACCOUNT
-else
-  accounts=$(echo "$accounts" | sed -e 's/,/ /g')
-fi
-
-if ! test -t 0; then
-  say "I: Renicing because we are not run interactively…"
-  renice 20 -p $$ >/dev/null
-  ionice -c3 -p $$
-fi
-
-getlock()
-{
-  lockfile="$VAR/.$1.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 [ -d "$VAR" ] && ! lockfile -0 -r0 -l 3600 "$lockfile" 2>/dev/null; then
-    return 1
-  fi
-  trap trapfn 0
-}
-
-failures=0
-for account in $accounts; do
-  getlock "$account" || {
-    err "E: unable to acquire lock for account $account, already running?"
-    failures=$(($failures + 1))
-    continue
-  }
-
-  [ -d $VAR/$account ] || {
-    err "E: $VAR/$account does not exist, please create it first."
-    continue
-  }
-
-  eval /usr/bin/offlineimap -a $account -k metadata=$VAR/$account $opts || \
-    failures=$(($failures + 1))
-
-  trapfn
-done
-
-if [ $failures -gt 0 ]; then
-  exit 1
-else
-  exit 0
-fi

diff --git a/.crontab.d/offlineimap b/.crontab.d/offlineimap
index e335ef372c10a5a827a938bf9589ef7219cb0546..18f5e91fd512bd368c98bc09cb811cc7b86c558c 100644 (file)
--- a/.crontab.d/offlineimap
+++ b/.crontab.d/offlineimap
@@ -1,2 +1,2 @@
-*/30 * * * * sleep $((900 * $RANDOM / 32768)) && ip r | grep -q via && $HOME/.bin/offlineimap --quiet -o -a madduck.net
-55 */8 * * * sleep $((300 * $RANDOM / 32768)) && ip r | grep -q via && $HOME/.bin/offlineimap --quiet -o -a madduck.net_bulk
+*/30 * * * * sleep $((900 * $RANDOM / 32768)) && ip r | grep -q via && offlineimap --quiet -o -a madduck.net
+55 */8 * * * sleep $((300 * $RANDOM / 32768)) && ip r | grep -q via && offlineimap --quiet -o -a madduck.net_bulk

diff --git a/.offlineimaprc b/.offlineimaprc
index be3fb02ca3afebde57a4b0b09f34319adbff290e..0438ee18c0d06a17fc205e5b38f28737eb169568 100644 (file)
--- a/.offlineimaprc
+++ b/.offlineimaprc
@@ -1,6 +1,6 @@
 [general]
 [general]

-#metadata = ~/.var/offlineimap
-accounts = 
+metadata = ~/.var/offlineimap
+accounts = madduck.net

 ui = Basic
 ignore-readonly = no
 socktimeout = 30
 ui = Basic
 ignore-readonly = no
 socktimeout = 30