gpg-refresh-cache: accept key ID as optional arg

[bin.git] / pull-mail

diff --git a/pull-mail b/pull-mail
index 2c11b992c659d00d940921a0c1610ea6fc3a4a3b..a669a29508d9381b7e505908a1513e0f143e72fd 100755 (executable)
--- a/pull-mail
+++ b/pull-mail
@@ -1,10 +1,26 @@
 #! /bin/sh
-set -e
 
-if ! [ -e ~/.nomail ]; then
-    date >> ~/.fetchmail/log
-    fetchmail >> ~/.fetchmail/log
-    bsmtp-pull gluck
+if [ -f ~/.nomail ] && [ "$1" != --force ]; then
+       exit 0
 fi
 
+loadavg="$(cut -d. -f1 /proc/loadavg)"
+if [ "$loadavg" -ge 5 ] && [ "$1" != --force ]; then
+       # System load is too high. Don't contribute to it.
+       exit 0
+fi
+
+bsmtp-pull master
+
+hour="$(date +%H)"
+case $hour in
+    0[0-4789]|[12]*)
+       date >> ~/.fetchmail/log
+       fetchmail >> ~/.fetchmail/log
+       logrotate -s ~/.fetchmail/logrotate.status ~/.fetchmail/logrotate.conf
+       ;;
+esac
+
+notmuch new >/dev/null 2>&1
+
 exit 0