diff --git a/scripts/wk/kit/build_win.py b/scripts/wk/kit/build_win.py index 3add5eae..58bb2515 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\d+)\|(?P.*)') 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 diff --git a/scripts/wk/repairs/win.py b/scripts/wk/repairs/win.py index 717eda00..8766b693 100644 --- a/scripts/wk/repairs/win.py +++ b/scripts/wk/repairs/win.py @@ -175,11 +175,15 @@ def end_session(menus): 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) + run_tool('Sysinternals', 'Autologon', '-accepteula', download=True) reg_set_value( 'HKLM', r'Software\Microsoft\Windows NT\CurrentVersion\Winlogon', 'AutoAdminLogon', '0', 'SZ', @@ -257,7 +261,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']: diff --git a/scripts/wk/setup/win.py b/scripts/wk/setup/win.py index 078ef38e..a1c7f83d 100644 --- a/scripts/wk/setup/win.py +++ b/scripts/wk/setup/win.py @@ -920,7 +920,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') 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 +