diff --git a/.bin/Scripts/functions/browsers.py b/.bin/Scripts/functions/browsers.py index 777c9dc6..f52e2c4e 100644 --- a/.bin/Scripts/functions/browsers.py +++ b/.bin/Scripts/functions/browsers.py @@ -9,11 +9,11 @@ from settings.browsers import * browser_data = {} other_results = { 'Error': { - 'MultipleInstallationsError': 'Multiple installations detected', + 'MultipleInstallationsError': 'MULTIPLE INSTALLATIONS DETECTED', }, 'Warning': { - 'NotInstalledError': 'Not installed', - 'NoProfilesError': 'No profiles found', + 'NotInstalledError': 'NOT INSTALLED', + 'NoProfilesError': 'NO PROFILES FOUND', } } @@ -385,7 +385,7 @@ def install_adblock( # installation status. try_and_print(message='{}...'.format(browser), indent=indent, width=width, - cs='Done', function=popen_program, + cs='STARTED', function=popen_program, cmd=[exe_path, *urls], check=False) @@ -459,7 +459,7 @@ def scan_for_browsers(just_firefox=False, silent=False, skip_ie=False): pass else: try_and_print(message='{}...'.format(name), - function=get_browser_details, cs='Detected', + function=get_browser_details, cs='DETECTED', other_results=other_results, name=name) diff --git a/.bin/Scripts/system_setup.py b/.bin/Scripts/system_setup.py index 549555a0..f6bf12b3 100644 --- a/.bin/Scripts/system_setup.py +++ b/.bin/Scripts/system_setup.py @@ -24,23 +24,23 @@ set_log_file('System Setup.log') # pylint: disable=bad-whitespace,line-too-long OTHER_RESULTS = { 'Error': { - 'BIOSKeyNotFoundError': 'BIOS key not found', - 'CalledProcessError': 'Unknown Error', - 'FileNotFoundError': 'File not found', - 'GenericError': 'Unknown Error', - 'Not4KAlignedError': 'False', - 'SecureBootDisabledError': 'Disabled', - 'WindowsUnsupportedError': 'Unsupported', + 'BIOSKeyNotFoundError': 'BIOS KEY NOT FOUND', + 'CalledProcessError': 'UNKNOWN ERROR', + 'FileNotFoundError': 'FILE NOT FOUND', + 'GenericError': 'UNKNOWN ERROR', + 'Not4KAlignedError': 'FALSE', + 'SecureBootDisabledError': 'DISABLED', + 'WindowsUnsupportedError': 'UNSUPPORTED', }, 'Warning': { - 'GenericRepair': 'Repaired', - 'NoProfilesError': 'No profiles found', - 'NotInstalledError': 'Not installed', - 'OSInstalledLegacyError': 'OS installed Legacy', - 'SecureBootNotAvailError': 'Not available', - 'SecureBootUnknownError': 'Unknown', - 'UnsupportedOSError': 'Unsupported OS', - 'WindowsOutdatedError': 'Outdated', + 'GenericRepair': 'REPAIRED', + 'NoProfilesError': 'NO PROFILES FOUND', + 'NotInstalledError': 'NOT INSTALLED', + 'OSInstalledLegacyError': 'OS INSTALLED LEGACY', + 'SecureBootNotAvailError': 'NOT AVAILABLE', + 'SecureBootUnknownError': 'UNKNOWN', + 'UnsupportedOSError': 'UNSUPPORTED OS', + 'WindowsOutdatedError': 'OUTDATED', }, } SETUP_ACTIONS = OrderedDict({