- up for 0.92

[packages/clamav.git] / clamav-cron-updatedb

diff --git a/clamav-cron-updatedb b/clamav-cron-updatedb
index 0ada8b3e02076718cc8656f943d17be9575b51d4..b2ffb4c0fafd9fb3ec0e06ec68369cdc6b93142a 100644 (file)
--- a/clamav-cron-updatedb
+++ b/clamav-cron-updatedb
@@ -1,19 +1,17 @@
 #!/bin/sh
 
-[ -z "$UPDATE_HOUR" ] && UPDATE_HOUR=2
-[ -z "$UPDATE_QUIET" ] && UPDATE_QUIET="yes"
+[ -f /etc/sysconfig/clamd ] && . /etc/sysconfig/clamd
 
+[ -z "$UPDATE_HOUR" ] && UPDATE_HOUR=2
 DIV="$(echo "$(LC_ALL=C date "+%H % ${UPDATE_HOUR}")" | bc)"
+[ "$DIV" = "0" ] || exit 0
+
+[ -z "$UPDATE_MAIL_MESSAGES" ] && UPDATE_MAIL_MESSAGES="errors"
+[ "$UPDATE_MAIL_MESSAGES" = "errors" ] && freshclamopt="--quiet"
 
-if [ "$UPDATE_QUIET" = "yes" ]; then
-    freshclamopt="--quiet"
-fi
-    
-if [ "$DIV" = "0" ]; then
-       umask 022
-       log=$(/usr/bin/freshclam $freshclamopt -l /var/log/clamav.log --daemon-notify 2>&1)
-       if [ "$UPDATE_QUIET" != "yes" ]; then
-           echo "$log"
-       fi
-fi
+notify=
+[ -f /var/lock/subsys/clamd ] && notify="--daemon-notify"
 
+umask 022
+log=$(/usr/bin/freshclam $freshclamopt $notify 2>&1)
+[ "$UPDATE_MAIL_MESSAGES" != "none" -a -n "$log" ] && echo "$log"