Correct install check files 10/1210/1
authorliamfallon <liam.fallon@est.tech>
Wed, 15 May 2019 13:14:10 +0000 (14:14 +0100)
committerliamfallon <liam.fallon@est.tech>
Wed, 15 May 2019 13:14:21 +0000 (14:14 +0100)
The virus definitions can be in daily.cld or daily.cvd, the
script is updated to reflect that

Change-Id: I6c5bbda2e25544d0e78c7e0fca6d92c55486072e
Signed-off-by: liamfallon <liam.fallon@est.tech>
clamav/etc/cron.daily/clamav

index 791e847b79e5c1cb982eafc5fccc86b1a2d4a103..fee539821af9cfd7b7e41c96b7ab92a6d2182ff5 100755 (executable)
@@ -48,7 +48,7 @@ SCANQNT="/var/.quatrantine"
 # Check if clamav is installed
 DATE=`date -u`
 
-if [ ! -f /var/lib/clamav/daily.cvd -o ! -x /usr/bin/clamscan -o ! -d /var/log/clamav ]
+if ( [ ! -f /var/lib/clamav/daily.cld ] && [ ! -f /var/lib/clamav/daily.cvd ] ) || [ ! -x /usr/bin/clamscan ] || [ ! -d /var/log/clamav ]
 then
   echo "$DATE: clamav is not installed or is incorrectly installed." >> $ERRORLOG
   notify-send-user -i /usr/share/pixmaps/clamtk.png -u critical  "clamav: software not installed correctly"