From 1f618a4152a0972328f3d447b2c4d09fed7ce226 Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Fri, 7 May 2021 23:50:34 -0600
Subject: [PATCH] Run AVRemover on first run of Auto Repairs

---
 scripts/wk/cfg/tools.py   | 4 ++--
 scripts/wk/repairs/win.py | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/scripts/wk/cfg/tools.py b/scripts/wk/cfg/tools.py
index 27e56796..289fd8b7 100644
--- a/scripts/wk/cfg/tools.py
+++ b/scripts/wk/cfg/tools.py
@@ -14,6 +14,8 @@ SOURCES = {
   'AIDA64': 'https://download.aida64.com/aida64engineer633.zip',
   'aria2': 'https://github.com/aria2/aria2/releases/download/release-1.35.0/aria2-1.35.0-win-32bit-build1.zip',
   'Autoruns': 'https://download.sysinternals.com/files/Autoruns.zip',
+  'AVRemover32': 'https://download.eset.com/com/eset/tools/installers/av_remover/latest/avremover_nt32_enu.exe',
+  'AVRemover64': 'https://download.eset.com/com/eset/tools/installers/av_remover/latest/avremover_nt64_enu.exe',
   'BleachBit': 'https://download.bleachbit.org/BleachBit-4.2.0-portable.zip',
   'BlueScreenView32': 'http://www.nirsoft.net/utils/bluescreenview.zip',
   'BlueScreenView64': 'http://www.nirsoft.net/utils/bluescreenview-x64.zip',
@@ -21,8 +23,6 @@ SOURCES = {
   'ClassicStartSkin': 'http://www.classicshell.net/forum/download/file.php?id=3001&sid=9a195960d98fd754867dcb63d9315335',
   'Du': 'https://download.sysinternals.com/files/DU.zip',
   'ERUNT': 'http://www.aumha.org/downloads/erunt.zip',
-  'ESET AVRemover32': 'https://download.eset.com/com/eset/tools/installers/av_remover/latest/avremover_nt32_enu.exe',
-  'ESET AVRemover64': 'https://download.eset.com/com/eset/tools/installers/av_remover/latest/avremover_nt64_enu.exe',
   'ESET NOD32 AV': 'https://download.eset.com/com/eset/apps/home/eav/windows/latest/eav_nt64.exe',
   'ESET Online Scanner': 'https://download.eset.com/com/eset/tools/online_scanner/latest/esetonlinescanner_enu.exe',
   'Everything32': 'https://www.voidtools.com/Everything-1.4.1.1005.x86.en-US.zip',
diff --git a/scripts/wk/repairs/win.py b/scripts/wk/repairs/win.py
index 46a7a091..8e54dd63 100644
--- a/scripts/wk/repairs/win.py
+++ b/scripts/wk/repairs/win.py
@@ -253,6 +253,13 @@ def init(menus):
   """Initialize Auto Repairs."""
   session_started = is_session_started()
 
+  # Run AVRemover
+  if not session_started:
+    TRY_PRINT.run(
+      'Run AVRemover...', run_tool, 'AVRemover', 'AVRemover',
+      download=True, msg_good='DONE',
+      )
+
   # Start or resume a repair session
   if session_started:
     load_settings(menus)