Be less aggressive with clamav updates

autotest/test.d/01-setup

@@ -17,15 +17,16 @@ if [ $( grep -c public_ip /etc/hosts ) == 0 ]; then echo $(sympl-ip) public_ip >
 # remove any existing definations
 touch /srv/$(hostname -f)/config/antivirus
 
-# Start freshclam to download new definitions, whatever state it's in
-systemctl unmask clamav-freshclam
+# try a defination update manually with the service stopped
 service clamav-freshclam stop
-rm -rf /run/clamav
+freshclam
+# Start freshclam to download/update new definitions, whatever state it's in
+systemctl unmask clamav-freshclam
 service clamav-freshclam start
 
 sleep 3
 
-echo -n "I: Waiting for clamav to download databases."
+echo -n "I: Waiting for clamav to download/update databases."
 for i in $(seq 1 100) ; do
   if [ -f "/var/lib/clamav/main.cvd" -o -f "/var/lib/clamav/main.cld" ] ; then
     echo -n ' 1/3 '