- todo updates

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

diff --git a/clamav-post-updatedb b/clamav-post-updatedb
index eb7231626ccc2ac6aea1a078c0b2f28074cfa09b..96c7933c81307774fd8198cd3e18c357968f6d9b 100644 (file)
--- a/clamav-post-updatedb
+++ b/clamav-post-updatedb
@@ -2,18 +2,16 @@
 
 [ -f /etc/sysconfig/clamd ] && . /etc/sysconfig/clamd
 
-[ -z "$UPDATE_QUIET" ] && UPDATE_QUIET="yes"
 [ -z "$FETCH_AFTER_UPGRADE" ] && FETCH_AFTER_UPGRADE="no"
 
-if [ "$UPDATE_QUIET" = "yes" ]; then
-    freshclamopt="--quiet"
-fi
-    
 if [ "$FETCH_AFTER_UPGRADE" = "yes" ]; then
-       umask 022
-       log=$(/usr/bin/freshclam $freshclamopt -l /var/log/freshclam.log --daemon-notify 2>&1)
-       if [ "$UPDATE_QUIET" != "yes" ]; then
-           echo "$log"
+       if [ "$UPDATE_QUIET" = "yes" ]; then
+               freshclamopt="--quiet"
        fi
-fi
 
+       notify=
+       [ -f /var/lock/subsys/clamd ] && notify="--daemon-notify"
+
+       umask 022
+       /usr/bin/freshclam $freshclamopt -l /var/log/freshclam.log $notify || :
+fi