From 2f655787e5e2f6d6c4b102c84ea080e30da956f8 Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Fri, 15 Oct 2021 01:04:36 -0600
Subject: [PATCH 1/5] Avoid if quitting Auto Repairs without running it

i.e. Opened the script, get to the main menu, and then exit.
---
 scripts/wk/repairs/win.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/scripts/wk/repairs/win.py b/scripts/wk/repairs/win.py
index 7387ed02..ab0c0082 100644
--- a/scripts/wk/repairs/win.py
+++ b/scripts/wk/repairs/win.py
@@ -167,9 +167,13 @@ def end_session():
     LOG.error("Failed to remove scheduled task or it doesn't exist.")
 
   # Disable Autologon
-  autologon_selected = reg_read_value(
-    'HKCU', AUTO_REPAIR_KEY, 'Use Autologon',
-    )
+  try:
+    autologon_selected = reg_read_value(
+      'HKCU', AUTO_REPAIR_KEY, 'Use Autologon',
+      )
+  except FileNotFoundError:
+    autologon_selected = False
+    # Assuming it isn't being used
   if autologon_selected and is_autologon_enabled():
     run_tool('Sysinternals', 'Autologon', download=True)
     reg_set_value(

From fd27af040b7e5aa1eda5e41fa03b7b267a641c34 Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Fri, 15 Oct 2021 01:06:02 -0600
Subject: [PATCH 2/5] Accept the Autologon EULA automatically

---
 scripts/wk/repairs/win.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/wk/repairs/win.py b/scripts/wk/repairs/win.py
index ab0c0082..478bcb56 100644
--- a/scripts/wk/repairs/win.py
+++ b/scripts/wk/repairs/win.py
@@ -175,7 +175,7 @@ def end_session():
     autologon_selected = False
     # Assuming it isn't being used
   if autologon_selected and is_autologon_enabled():
-    run_tool('Sysinternals', 'Autologon', download=True)
+    run_tool('Sysinternals', 'Autologon', '-accepteula', download=True)
     reg_set_value(
       'HKLM', r'Software\Microsoft\Windows NT\CurrentVersion\Winlogon',
       'AutoAdminLogon', '0', 'SZ',
@@ -250,7 +250,7 @@ def init_run(options):
   if options['Use Autologon']['Selected'] and not is_autologon_enabled():
     TRY_PRINT.run(
       'Running Autologon...', run_tool,
-      'Sysinternals', 'Autologon',
+      'Sysinternals', 'Autologon', '-accepteula',
       download=True, msg_good='DONE',
       )
   if options['Sync Clock']['Selected']:

From 7940e3a21944ba02dfd1e7f4c9917ca4b955b499 Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Fri, 15 Oct 2021 01:19:24 -0600
Subject: [PATCH 3/5] Avoid crash if profiles.ini is using UTF-16 LE BOM

---
 scripts/wk/setup/win.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/wk/setup/win.py b/scripts/wk/setup/win.py
index 1181e84a..43eef7e1 100644
--- a/scripts/wk/setup/win.py
+++ b/scripts/wk/setup/win.py
@@ -828,7 +828,11 @@ def get_firefox_default_profile(profiles_ini):
 
   # Parse INI
   parser = configparser.ConfigParser()
-  parser.read(profiles_ini)
+  try:
+    parser.read(profiles_ini)
+  except (configparser.ParsingError, UnicodeError):
+    # Assuming we have the wrong encoding
+    parser.read(profiles_ini, encoding='utf-16')
   for section in parser.sections():
     if section.lower().startswith('install'):
       default_profile = parser[section].get('default')

From 6d0d929c44f97dd5155f53b277d772f23582f9c7 Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Fri, 15 Oct 2021 01:24:57 -0600
Subject: [PATCH 4/5] Hide HWiNFO sensor tooltips

---
 setup/windows/bin/HWiNFO/general.ini | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/setup/windows/bin/HWiNFO/general.ini b/setup/windows/bin/HWiNFO/general.ini
index 1745ddb0..05104899 100644
--- a/setup/windows/bin/HWiNFO/general.ini
+++ b/setup/windows/bin/HWiNFO/general.ini
@@ -662,3 +662,5 @@ DecimalSeparator=.
 ThousandsSeparator=,
 CsvSeparator=,
 TextButtons=0
+SensorToolTips=0
+

From 6a9299dea18938f066c5cccfb2b7b70d84a66d45 Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Fri, 15 Oct 2021 02:30:03 -0600
Subject: [PATCH 5/5] Add bad workaround for now

---
 scripts/wk/kit/build_win.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/wk/kit/build_win.py b/scripts/wk/kit/build_win.py
index e2fcd441..689e5ba6 100644
--- a/scripts/wk/kit/build_win.py
+++ b/scripts/wk/kit/build_win.py
@@ -48,7 +48,7 @@ REGEX_SDIO_NETWORK_DRIVERS = re.compile(
   )
 REGEX_TORRENT_INDICES = re.compile(r'^(?P<index>\d+)\|(?P<path>.*)')
 SEVEN_ZIP = get_tool_path('7-Zip', '7za')
-SEVEN_ZIP_FULL = get_tool_path('7-Zip', '7z') # TODO: Replace with unrar from Pypi?
+SEVEN_ZIP_FULL = get_tool_path('7-Zip', '7z', check=False) # TODO: Replace with unrar from Pypi?
 WIDTH = 50