X-Git-Url: https://git.donarmstrong.com/?p=bin.git;a=blobdiff_plain;f=getmail;h=96933ef48384691b3d09c55569dff0e930e65b5f;hp=09ec4bc0a5d5ad75859a0d71bea3f0c34d811a99;hb=4621d23526ccf936d1ad076ece0bc663510dfc52;hpb=1a8f9173abd091c284082cccbb41bfb5763c33ad

diff --git a/getmail b/getmail
index 09ec4bc..96933ef 100755
--- a/getmail
+++ b/getmail
@@ -1,14 +1,16 @@
 #!/bin/sh
 
+if [ -n "$VERBOSE" ]; then
+    set -x
+fi;
+
 # Configure the two things below for your MUA and the host being run.
-IMAPHOST=linnode.donarmstrong.com
+IMAPHOST=$( awk -F= '/remotehost/{print $2}' ~/.offlineimaprc | head -n 1 )
 MUA=mutt
 
-#set -x
-
 # 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,36 +18,45 @@ if [ -z "$HOSTNAME" ]; then
     HOSTNAME="$(hostname)"
 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
-    if ping -q -c 3 $IMAPHOST >/dev/null 2>&1; then
-	# source the ssh info if it exists
-	if [ -e ~/.ssh/"ssh_agent_info_$HOSTNAME" ]; then
-	    . ~/.ssh/"ssh_agent_info_$HOSTNAME" > /dev/null;
-	fi;
-	PID="$(pgrep -U $(id -u) offlineimap)";
-	if [ -n "$PID" ]; then
-	    # if offlineimap has been running for more than 20 minutes
-	    if [ $(( $(date +'%s') - $(stat -c '%Y' /proc/$PID/cmdline) )) -gt 1200 ]; then
+IONICE=""
+if which ionice >/dev/null 2>&1; then
+    IONICE="ionice -c 3"
+fi;
+
+# if we are running under cron
+if [ -n "$CRON" ]; then
+    # and there is no MUA open, exit
+    if ! kill -0 `pgrep -U $(id -u) -x $MUA` 2>/dev/null; then
+        exit 0;
+    fi;
+    # if there is not a working ssh master, exit.
+    if ! ssh -O check $IMAPHOST 2>&1|grep -q running; then
+        exit 0;
+    fi;
+fi;
+
+# source the ssh info if it exists
+if [ -e ~/.ssh/"ssh_agent_info_$HOSTNAME" ]; then
+	. ~/.ssh/"ssh_agent_info_$HOSTNAME" > /dev/null;
+fi;
+
+PID="$(pgrep -U $(id -u) offlineimap)";
+if [ -n "$PID" ]; 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;
-	    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-]+)/;
-                      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;
+		PID="$(pgrep -U $(id -u) offlineimap)";
 	fi;
+fi;
+
+if [ -z "$PID" ]; then
+	nice -n 19 ${IONICE} offlineimap -o -u 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 Inbox $account.$list > /dev/null);';
+    if which notmuch >/dev/null 2>&1; then
+        nice -n 19 ${IONICE} notmuch new >/dev/null 2>&1;
     fi;
 fi;