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

Moved check_os_and_abort logic to its own function

Browse source
This commit is contained in:
2Shirt 2019-05-12 18:13:42 -06:00
parent e869fc96b0
commit 8ad9e834ef
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
.bin/Scripts/system_setup.py
View file

@ -155,6 +155,19 @@ SETUP_QUESTIONS = {
# Functions # Functions
def check_os_and_abort():
"""Check OS and prompt to abort if not supported."""
result = try_and_print(
message='OS support status...',
function=check_os_support_status,
cs='GOOD',
)
if not result['CS'] and 'Unsupported' in result['Error']:
print_warning('OS version not supported by this script')
if not ask('Continue anyway? (NOT RECOMMENDED)'):
abort()
def get_actions(setup_mode, answers): def get_actions(setup_mode, answers):
"""Get actions to perform based on setup_mode, returns OrderedDict.""" """Get actions to perform based on setup_mode, returns OrderedDict."""
actions = OrderedDict({}) actions = OrderedDict({})
@ -292,15 +305,7 @@ def main():
clear_screen() clear_screen()
# Check installed OS # Check installed OS
result = try_and_print( check_os_and_abort()
message='OS support status...',
function=check_os_support_status,
cs='GOOD',
)
if not result['CS'] and 'Unsupported' in result['Error']:
print_warning('OS version not supported by this script')
if not ask('Continue anyway? (NOT RECOMMENDED)'):
abort()
# Get setup mode # Get setup mode
setup_mode = get_mode() setup_mode = get_mode()