From a9bb68352231174eb420c4f4743d7fa8770649c0 Mon Sep 17 00:00:00 2001 From: AspieSoft Date: Sun, 7 May 2023 19:34:19 -0400 Subject: [PATCH] updated --- bin/apps/aspiesoft-clamav-scanner/scan-file.sh | 5 +++-- bin/scripts/dnf/security.sh | 2 ++ bin/scripts/main/virus-scan.sh | 5 ++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/bin/apps/aspiesoft-clamav-scanner/scan-file.sh b/bin/apps/aspiesoft-clamav-scanner/scan-file.sh index 0d00d31e..21fb441b 100644 --- a/bin/apps/aspiesoft-clamav-scanner/scan-file.sh +++ b/bin/apps/aspiesoft-clamav-scanner/scan-file.sh @@ -19,11 +19,12 @@ fi echo "$FILE" >> $scanList ( - fileName=$(echo $FILE | sed -e "s#^$DIR/##") + fileName=$(echo "$FILE" | sed -e "s#^$DIR/##") notify-send -i "/etc/aspiesoft-clamav-scanner/icon.png" -t 3 "Started Scanning" "$fileName" - clamscan -r --bell --move="/VirusScan/quarantine" --exclude-dir="/VirusScan/quarantine" $FILE &>/dev/null + sudo nice -n 15 clamscan &>/dev/null + clamscan -r --bell --move="/VirusScan/quarantine" --exclude-dir="/VirusScan/quarantine" "$FILE" &>/dev/null sed "#^$FILE$#d" $scanList if [ -s "$FILE" ] ; then diff --git a/bin/scripts/dnf/security.sh b/bin/scripts/dnf/security.sh index 7c2f041c..5a572272 100644 --- a/bin/scripts/dnf/security.sh +++ b/bin/scripts/dnf/security.sh @@ -28,6 +28,8 @@ loading=$(startLoading "Installing Security Software") #cp -R -f ./bin/apps/clamtk/* ~/.clamtk #sudo sed -r -i "s/USERNAME/$USER/g" ~/.clamtk/cron + sudo dnf install cronie + sudo freshclam &>/dev/null sudo mkdir -p /VirusScan/quarantine &>/dev/null sudo chmod 664 /VirusScan/quarantine &>/dev/null diff --git a/bin/scripts/main/virus-scan.sh b/bin/scripts/main/virus-scan.sh index 34e0fc99..6cc4f697 100644 --- a/bin/scripts/main/virus-scan.sh +++ b/bin/scripts/main/virus-scan.sh @@ -24,7 +24,10 @@ echo echo "Scanning for viruses..." scanFinished=$(mktemp) && echo "false" >$scanFinished -(sudo clamscan -r --bell --move="/VirusScan/quarantine" --exclude-dir="/VirusScan/quarantine" --exclude-dir="/home/$USER/.clamtk/viruses" --exclude-dir="smb4k" --exclude-dir="/run/user/$USER/gvfs" --exclude-dir="/home/$USER/.gvfs" --exclude-dir=".thunderbird" --exclude-dir=".mozilla-thunderbird" --exclude-dir=".evolution" --exclude-dir="Mail" --exclude-dir="kmail" --exclude-dir="^/sys" $scanDir &> scan.log && echo "true" > $scanFinished) & +( + sudo nice -n 15 clamscan &>/dev/null + sudo clamscan -r --bell --move="/VirusScan/quarantine" --exclude-dir="/VirusScan/quarantine" --exclude-dir="/home/$USER/.clamtk/viruses" --exclude-dir="smb4k" --exclude-dir="/run/user/$USER/gvfs" --exclude-dir="/home/$USER/.gvfs" --exclude-dir=".thunderbird" --exclude-dir=".mozilla-thunderbird" --exclude-dir=".evolution" --exclude-dir="Mail" --exclude-dir="kmail" --exclude-dir="^/sys" $scanDir &> scan.log && echo "true" > $scanFinished +) & tempFileCount=$(mktemp) && echo "false" >$tempFileCount (echo $(sudo ls --ignore="/VirusScan/quarantine" --ignore="/home/$USER/.clamtk/viruses" --ignore="smb4k" --ignore="/run/user/$USER/gvfs" --ignore="/home/$USER/.gvfs" --ignore=".thunderbird" --ignore=".mozilla-thunderbird" --ignore=".evolution" --ignore="Mail" --ignore="kmail" --ignore="^/sys" -l -R $scanDir | grep ^- | awk '{print $9}' | wc -l) > $tempFileCount) &