packages: clamav/clamav-cron-updatedb - load sysconfig/clamd first, then ac...

[gotar]

Author: gotar                        Date: Sat May 22 14:12:53 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- load sysconfig/clamd first, then act (broken in 1.8),
- get rid of intermediate variables (messed in 1.8),
- again, compare integers with -eq not =,
- numeric output of `date +%[kH]` doesn't need LC_ALL,
- finally, it's _divisor_ which mustn't be equal to 0, not divident!
  previous test disabled updates at midnight.

---- Files affected:
packages/clamav:
   clamav-cron-updatedb (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: packages/clamav/clamav-cron-updatedb
diff -u packages/clamav/clamav-cron-updatedb:1.11 packages/clamav/clamav-cron-updatedb:1.12
--- packages/clamav/clamav-cron-updatedb:1.11	Wed Oct 21 15:00:50 2009
+++ packages/clamav/clamav-cron-updatedb	Sat May 22 16:12:48 2010
@@ -1,32 +1,18 @@
 #!/bin/sh
 
-# default as often as two hours
-UPDATE_HOUR=2
+[ -f /etc/sysconfig/clamd ] && . /etc/sysconfig/clamd
+[ -n "$UPDATE_HOUR" -a "$UPDATE_HOUR" -gt 0 ] || UPDATE_HOUR=2
 
-if [ -f /etc/sysconfig/clamd ]; then
-	. /etc/sysconfig/clamd
-fi
+[ $((`date '+%k'` % $UPDATE_HOUR)) -eq 0 ] || exit 0
 
-hour=$(LC_ALL=C date '+%k')
-
-# skip divide errors
-[ "$hour" = "0" ] && exit 0
-
-div=$((hour % $UPDATE_HOUR))
-
-[ "$div" = "0" ] || exit 0
-
-# sleep random amount to avoid all servers hitting clamav servers at same time
-# but at most 1800 seconds (half hour)
-rand=${RANDOM:-$$}
-rand=$((rand % 1800))
-sleep $rand
+# sleep random period to avoid all servers hitting clamav servers at the same time,
+# but 1800 seconds (half an hour) at most
+sleep $((RANDOM % 1800))
 
 [ "$UPDATE_MAIL_MESSAGES" ] || UPDATE_MAIL_MESSAGES="errors"
 [ "$UPDATE_MAIL_MESSAGES" = "errors" ] && freshclamopt="--quiet"
 
-notify=
-[ -f /var/lock/subsys/clamd ] && notify="--daemon-notify"
+[ -f /var/lock/subsys/clamd ] && notify="--daemon-notify" || notify=
 
 umask 022
 log=$(/usr/bin/freshclam $freshclamopt $notify 2>&1)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/clamav/clamav-cron-updatedb?r1=1.11&r2=1.12&f=u