- replaced UPDATE_QUIET with UPDATE_MAIL_MESSAGES

Changed files:
    clamav-cron-updatedb -> 1.5

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