From bded5f473c887fb36a2ca9d473635c1b84d0a04b Mon Sep 17 00:00:00 2001 From: Zach White Date: Fri, 18 Dec 2020 16:42:30 -0800 Subject: [PATCH] simplify qmk doctor to make room for #11208 (#11242) --- lib/python/qmk/cli/doctor.py | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/lib/python/qmk/cli/doctor.py b/lib/python/qmk/cli/doctor.py index 4fe318b636..25e2e239cb 100755 --- a/lib/python/qmk/cli/doctor.py +++ b/lib/python/qmk/cli/doctor.py @@ -281,6 +281,22 @@ def is_executable(command): return False +def os_tests(): + """Determine our OS and run platform specific tests + """ + platform_id = platform.platform().lower() + + if 'darwin' in platform_id or 'macos' in platform_id: + return os_test_macos() + elif 'linux' in platform_id: + return os_test_linux() + elif 'windows' in platform_id: + return os_test_windows() + else: + cli.log.warning('Unsupported OS detected: %s', platform_id) + return CheckStatus.WARNING + + def os_test_linux(): """Run the Linux specific tests. """ @@ -317,20 +333,8 @@ def doctor(cli): * [ ] Compile a trivial program with each compiler """ cli.log.info('QMK Doctor is checking your environment.') - status = CheckStatus.OK - # Determine our OS and run platform specific tests - platform_id = platform.platform().lower() - - if 'darwin' in platform_id or 'macos' in platform_id: - status = os_test_macos() - elif 'linux' in platform_id: - status = os_test_linux() - elif 'windows' in platform_id: - status = os_test_windows() - else: - cli.log.warning('Unsupported OS detected: %s', platform_id) - status = CheckStatus.WARNING + status = os_tests() cli.log.info('QMK home: {fg_cyan}%s', QMK_FIRMWARE)