Merge remote-tracking branch 'upstream/dev' into dev

scripts/wk/repairs/win.py

@@ -160,8 +160,8 @@ REG_UAC_DEFAULT_SETTINGS = {
   }
 SYSTEMDRIVE = os.environ.get('SYSTEMDRIVE', 'C:')
 EMSISOFT_INSTALL_PATH = f'{SYSTEMDRIVE}/EmsisoftCmd'
-WHITELIST = (
-  CONEMU_EXE,
+WHITELIST = '\n'.join((
+  str(CONEMU_EXE),
   fr'{PROGRAMFILES_32}\TeamViewer\TeamViewer.exe',
   fr'{PROGRAMFILES_32}\TeamViewer\TeamViewer_Desktop.exe',
   fr'{PROGRAMFILES_32}\TeamViewer\TeamViewer_Note.exe',
@@ -169,7 +169,7 @@ WHITELIST = (
   fr'{PROGRAMFILES_32}\TeamViewer\tv_w32.exe',
   fr'{PROGRAMFILES_32}\TeamViewer\tv_x64.exe',
   sys.executable,
-  )
+  ))
 WIDTH = 50
 TRY_PRINT = TryAndPrint()
 TRY_PRINT.width = WIDTH
@@ -1102,7 +1102,7 @@ def run_emsisoft_cmd_scan():
   whitelist_path = log_path.with_suffix('.wl')
 
   # Create whitelist
-  whitelist_path.write_text('\n'.join(map(str, WHITELIST)))
+  whitelist_path.write_text(WHITELIST)
 
   # Run Scan
   cmd = [
@@ -1230,9 +1230,7 @@ def run_rkill():
   log_path = format_log_path(log_name='RKill', timestamp=True, tool=True)
   log_path.parent.mkdir(parents=True, exist_ok=True)
   whitelist_path = log_path.with_suffix('.wl')
-  whitelist_path.write_text(
-    '\n'.join(map(str, WHITELIST)), encoding='utf-8',
-    )
+  whitelist_path.write_text(WHITELIST, encoding='utf-8')
   cmd_args = (
     '-l', log_path,
     '-w', whitelist_path,