2Shirt/WizardKit
2Shirt/WizardKit
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases 26 Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
2Shirt 2021-11-10 23:01:11 -07:00
commit 40d0b302f1
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
scripts/wk/os/win.py
View file

@ -599,8 +599,9 @@ def is_secure_boot_enabled(raise_exceptions=False, show_alert=False):
msg_warning = 'DISABLED\n\nOS installed LEGACY' msg_warning = 'DISABLED\n\nOS installed LEGACY'
else: else:
# Command completed # Command completed
enabled = 'True' in proc.stdout if 'True' in proc.stdout:
if 'False' in proc.stdout: enabled = True
elif 'False' in proc.stdout:
msg_error = 'DISABLED' msg_error = 'DISABLED'
else: else:
msg_warning = 'UNKNOWN' msg_warning = 'UNKNOWN'

8
scripts/wk/setup/win.py
View file

@ -593,8 +593,7 @@ def auto_show_os_name():
def auto_show_secure_boot_status(): def auto_show_secure_boot_status():
"""Display Secure Boot status.""" """Display Secure Boot status."""
TRY_PRINT.run( TRY_PRINT.run(
'Secure Boot...', is_secure_boot_enabled, 'Secure Boot...', check_secure_boot_status, msg_good='Enabled',
raise_exceptions=True, show_alert=True,
) )
@ -923,6 +922,11 @@ def uninstall_firefox():
# Misc Functions # Misc Functions
def check_secure_boot_status():
"""Check Secure Boot status."""
is_secure_boot_enabled(raise_exceptions=True, show_alert=True)
def get_firefox_default_profile(profiles_ini): def get_firefox_default_profile(profiles_ini):
"""Get Firefox default profile, returns(pathlib.Path, encoding) or None.""" """Get Firefox default profile, returns(pathlib.Path, encoding) or None."""
default_profile = None default_profile = None