pull-mail: add --force option; extend running times

diff --git a/pull-mail b/pull-mail
index 96532507a75b20abd32b04e482bee520131fc7f3..2a33895f9d0e90413e60dee3b5ad1ed1925e4f10 100755 (executable)
--- a/pull-mail
+++ b/pull-mail
@@ -5,16 +5,16 @@ if [ -f ~/.nomail ] && [ "$1" != --force ]; then
 fi
 
 loadavg="$(cut -d. -f1 /proc/loadavg)"
 fi
 
 loadavg="$(cut -d. -f1 /proc/loadavg)"

-if [ "$loadavg" -ge 5 ]; then
+if [ "$loadavg" -ge 5 ] && [ "$1" != --force ]; then

        # System load is too high. Don't contribute to it.
        exit 0
 fi
 
        # System load is too high. Don't contribute to it.
        exit 0
 fi
 

-bsmtp-pull gluck
+bsmtp-pull master

 
 hour="$(date +%H)"
 case $hour in
 
 hour="$(date +%H)"
 case $hour in

-    0[0-289]|[12]*)
+    0[0-4789]|[12]*)

        date >> ~/.fetchmail/log
        fetchmail >> ~/.fetchmail/log
        logrotate -s ~/.fetchmail/logrotate.status ~/.fetchmail/logrotate.conf
        date >> ~/.fetchmail/log
        fetchmail >> ~/.fetchmail/log
        logrotate -s ~/.fetchmail/logrotate.status ~/.fetchmail/logrotate.conf