X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=getmail;h=d8cf11920a02d5bcc69b1a0ae4f33519e7947d9c;hb=1886c7247cb16ed68a78cd5550b152689a465999;hp=94808dde6dc6cf5c8ea8251f40d70f58b836250f;hpb=84262b238cadf8a41ce7c24492ada344130c2e03;p=bin.git

diff --git a/getmail b/getmail
index 94808dd..d8cf119 100755
--- a/getmail
+++ b/getmail
@@ -8,7 +8,7 @@ MUA=mutt
 
 # Don't check mail if ~/.nocheck exists and we're not running
 # interactively.
-if [[ -z "$CRON" && -e ~/.nocheck ]]; then
+if [ -z "$CRON" ] && [ -e ~/.nocheck ]; then
     exit 0;
 fi;
 
@@ -16,6 +16,11 @@ if [ -z "$HOSTNAME" ]; then
     HOSTNAME="$(hostname)"
 fi;
 
+IONICE=""
+if which ionice >/dev/null 2>&1; then
+    IONICE="ionice -c 3"
+fi;
+
 # if we're not running under cron or there is a mailserver running
 if [ -z "$CRON" ] || kill -0 `pgrep -U $(id -u) -x $MUA` 2>/dev/null; then
     # and we can ping the imap host
@@ -29,23 +34,29 @@ if [ -z "$CRON" ] || kill -0 `pgrep -U $(id -u) -x $MUA` 2>/dev/null; then
 	    # if offlineimap has been running for more than 20 minutes
 	    if [ $(( $(date +'%s') - $(stat -c '%Y' /proc/$PID/cmdline) )) -gt 1200 ]; then
 		kill "$PID" >/dev/null 2>&1 || true;
-		sleep 1
+		sleep 5
 		kill -0 "$PID" >/dev/null 2>&1 && kill -9 "$PID" >/dev/null 2>&1;
+		PID="$(pgrep -U $(id -u) offlineimap)";
 	    fi;
 	fi;
-	if nice -n 19 offlineimap -o -u Noninteractive.Basic 2>&1 |grep validity| \
-	    perl -ne 'my ($account,$list) = /UID validity problem for folder ([\w-]+)\.([\w-]+)/;
+	if [ -z "$PID" ]; then
+	    if nice -n 19 ${IONICE} offlineimap -o -u Noninteractive.Basic 2>&1 |grep validity| \
+		perl -ne 'my ($account,$list) = /UID validity problem for folder ([\w-]+)\.([\w-]+)/;
                       next unless defined $account and length $account;
                       qx(/home/don/bin/deletemailbox -a $account $list > /dev/null);'; then
 	    # Clean the lists up too
-	    for account in bugs lists; do
-		find /home/don/Mail/$account -maxdepth 1 -mindepth 1 -type d \
-		    -exec sh -c 'test $(find {} -type f |wc -l) -eq 0' ';' \
-		    -printf '%f\000'|xargs -0 -rn 1 ~/bin/deletemailbox -a $account >/dev/null 2>&1;
-		find /home/don/Mail/$account -maxdepth 2 -mindepth 2 -iname 'new' \
-		    -type d -ctime +60 -printf '%h\n'|xargs -rn 1 basename|xargs \
-		    -rn 1 /home/don/bin/deletemailbox -a $account >/dev/null 2>&1;
-	    done;
+		for account in bugs lists; do
+		    find /home/don/Mail/$account -maxdepth 1 -mindepth 1 -type d \
+			-exec sh -c 'test $(find "{}" -type f |wc -l) -eq 0' ';' \
+			-printf '%f\000'|xargs -0 -rn 1 ~/bin/deletemailbox -a $account >/dev/null 2>&1;
+		    find /home/don/Mail/$account -maxdepth 2 -mindepth 2 -iname 'new' \
+			-type d -ctime +60 -printf '%h\n'|xargs -rn 1 basename|xargs \
+			-rn 1 /home/don/bin/deletemailbox -a $account >/dev/null 2>&1;
+		done;
+	    fi;
+            if which notmuch >/dev/null 2>&1; then
+                nice -n 19 ${IONICE} notmuch new >/dev/null 2>&1;
+            fi;
 	fi;
     fi;
 fi;