From b1f495dada4bfec09fea0b06a86372b3aad9fa2f Mon Sep 17 00:00:00 2001
From: 2Shirt <1923621+2Shirt@users.noreply.github.com>
Date: Sat, 6 Oct 2018 20:33:07 -0600
Subject: [PATCH] Updated ESET installation sections

* Apply user config before installation
  * Disables splash screen and desktop notifications
* Call update_eset_config() in update_kit.py
* Fixed install_eset_nod32_av()
* Moved ESET launcher to Installers
---
 .bin/Scripts/functions/setup.py    | 18 +++++++++++++++---
 .bin/Scripts/settings/launchers.py | 12 ++++++------
 .bin/Scripts/update_kit.py         |  1 +
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/.bin/Scripts/functions/setup.py b/.bin/Scripts/functions/setup.py
index af5b3791..81c84e25 100644
--- a/.bin/Scripts/functions/setup.py
+++ b/.bin/Scripts/functions/setup.py
@@ -32,6 +32,15 @@ SETTINGS_CLASSIC_START = {
             },
         },
     }
+SETTINGS_ESET = {
+    r'Software\ESET\ESET Security\CurrentVersion\gui\UI_CONFIG': {
+        'DWORD Items': {
+            'FullScreenMode': 0,
+            'ShowDesktopAlert': 0,
+            'ShowSplash': 0,
+            },
+        },
+    }
 SETTINGS_EXPLORER_SYSTEM_HW = {
     # Enable RegBack
     r'System\CurrentControlSet\Control\Session Manager\Configuration Manager': {
@@ -292,18 +301,21 @@ def install_classicstart_skin():
 def install_eset_nod32_av(scan_pups=True):
     """Install ESET NOD32 AV with custom config."""
     extract_item('ESETConfigs', silent=True)
-    config_file = '{BinDir}\ESETConfigs\{config_file}.xml'.format(
+    config_file = r'{BinDir}\ESETConfigs\{config_file}.xml'.format(
         config_file='eset-config' if scan_pups else 'eset-config-no-pup',
         **global_vars)
 
+    # Apply user configuration
+    write_registry_settings(SETTINGS_ESET, all_users=False)
+
     # Download
     result = try_and_print(message='Downloading Setup...', cs='Done',
         other_results=OTHER_RESULTS, function=download_generic,
         out_dir=global_vars['ClientDir'],
         out_name='eav_nt64.exe',
-        source_url=SOURCE_URLS['ESET NOD32'])
+        source_url=SOURCE_URLS['ESET NOD32 AV'])
     if not result['CS']:
-        raise GenericError('Failed to download ESET NOD32')
+        raise GenericError('Failed to download ESET NOD32 AV')
 
     # Install
     cmd = [r'{ClientDir}\eav_nt64.exe'.format(**global_vars),
diff --git a/.bin/Scripts/settings/launchers.py b/.bin/Scripts/settings/launchers.py
index 85d8881d..2ff92d8a 100644
--- a/.bin/Scripts/settings/launchers.py
+++ b/.bin/Scripts/settings/launchers.py
@@ -13,12 +13,6 @@ LAUNCHERS = {
             'L_PATH': 'd7II',
             'L_ITEM': 'd7II.exe',
             },
-        'Install ESET NOD32 AV': {
-            'L_TYPE': 'PyScript',
-            'L_PATH': 'Scripts',
-            'L_ITEM': 'install_eset_nod32_av.py',
-            'L_ELEV': 'True',
-            },
         'Post-d7II Work': {
             'L_TYPE': 'PyScript',
             'L_PATH': 'Scripts',
@@ -423,6 +417,12 @@ LAUNCHERS = {
             },
         },
     r'Installers': {
+        'ESET NOD32 AV': {
+            'L_TYPE': 'PyScript',
+            'L_PATH': 'Scripts',
+            'L_ITEM': 'install_eset_nod32_av.py',
+            'L_ELEV': 'True',
+            },
         'SW Bundle': {
             'L_TYPE': 'PyScript',
             'L_PATH': 'Scripts',
diff --git a/.bin/Scripts/update_kit.py b/.bin/Scripts/update_kit.py
index 945a473f..4644548f 100644
--- a/.bin/Scripts/update_kit.py
+++ b/.bin/Scripts/update_kit.py
@@ -59,6 +59,7 @@ if __name__ == '__main__':
         # Installers
         print_info('    Installers')
         try_and_print(message='Adobe Reader DC...', function=update_adobe_reader_dc, other_results=other_results, width=40)
+        try_and_print(message='ESET Configs...', function=update_eset_config, other_results=other_results, width=40)
         try_and_print(message='Macs Fan Control...', function=update_macs_fan_control, other_results=other_results, width=40)
         try_and_print(message='MS Office...', function=update_office, other_results=other_results, width=40)
         try_and_print(message='Visual C++ Runtimes...', function=update_vcredists, other_results=other_results, width=40)