diff options
| author | QMK Bot <hello@qmk.fm> | 2021-03-18 17:25:01 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-03-18 17:25:01 +0000 |
| commit | 90b1e271a8178d68e8c1be0beecfb26b42767f5f (patch) | |
| tree | 220aeb9d60900cd63243d468e588ae9a99ff211c | |
| parent | d97a9fb4ff71cb123708389896e4fa6f70e0cb42 (diff) | |
| parent | 69eca63a84e3c9017a15266e9c4be24cdb10e964 (diff) | |
| download | qmk_firmware-90b1e271a8178d68e8c1be0beecfb26b42767f5f.tar.gz qmk_firmware-90b1e271a8178d68e8c1be0beecfb26b42767f5f.zip | |
Merge remote-tracking branch 'origin/master' into develop
| -rwxr-xr-x | lib/python/qmk/cli/doctor.py | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/lib/python/qmk/cli/doctor.py b/lib/python/qmk/cli/doctor.py index 28d480707..9210737f1 100755 --- a/lib/python/qmk/cli/doctor.py +++ b/lib/python/qmk/cli/doctor.py | |||
| @@ -31,16 +31,22 @@ def os_tests(): | |||
| 31 | def os_test_linux(): | 31 | def os_test_linux(): |
| 32 | """Run the Linux specific tests. | 32 | """Run the Linux specific tests. |
| 33 | """ | 33 | """ |
| 34 | cli.log.info("Detected {fg_cyan}Linux.") | 34 | # Don't bother with udev on WSL, for now |
| 35 | from qmk.os_helpers.linux import check_udev_rules | 35 | if 'microsoft' in platform.uname().release.lower(): |
| 36 | cli.log.info("Detected {fg_cyan}Linux (WSL){fg_reset}.") | ||
| 36 | 37 | ||
| 37 | return check_udev_rules() | 38 | return CheckStatus.OK |
| 39 | else: | ||
| 40 | cli.log.info("Detected {fg_cyan}Linux{fg_reset}.") | ||
| 41 | from qmk.os_helpers.linux import check_udev_rules | ||
| 42 | |||
| 43 | return check_udev_rules() | ||
| 38 | 44 | ||
| 39 | 45 | ||
| 40 | def os_test_macos(): | 46 | def os_test_macos(): |
| 41 | """Run the Mac specific tests. | 47 | """Run the Mac specific tests. |
| 42 | """ | 48 | """ |
| 43 | cli.log.info("Detected {fg_cyan}macOS.") | 49 | cli.log.info("Detected {fg_cyan}macOS{fg_reset}.") |
| 44 | 50 | ||
| 45 | return CheckStatus.OK | 51 | return CheckStatus.OK |
| 46 | 52 | ||
| @@ -48,7 +54,7 @@ def os_test_macos(): | |||
| 48 | def os_test_windows(): | 54 | def os_test_windows(): |
| 49 | """Run the Windows specific tests. | 55 | """Run the Windows specific tests. |
| 50 | """ | 56 | """ |
| 51 | cli.log.info("Detected {fg_cyan}Windows.") | 57 | cli.log.info("Detected {fg_cyan}Windows{fg_reset}.") |
| 52 | 58 | ||
| 53 | return CheckStatus.OK | 59 | return CheckStatus.OK |
| 54 | 60 | ||
