From c89c0841468ad23153a9fc9578d344845df31a88 Mon Sep 17 00:00:00 2001 From: Erovia Date: Sun, 29 Mar 2020 14:29:44 +0200 Subject: CLI: More MSYS2 fixes (#8577) * CLI: More MSYS2 fixes Now I can fully setup and work with qmk_firmware on an MSYS2 installation without any errors or exceptions. * Apply suggestions from code review Co-Authored-By: skullydazed * Some improvements * Remove unnecessary import * Remove slow, unused code Getting the version from GIT was slow on both Windows and Docker. Until we find a better, faster way, this is removed. * remove unused imports * Implement @vomindoraan's suggestions * refine how we pick the shell to use * Apply @fauxpark's suggestions fauxpark investigated the topic of shells in MSYS2 a bit and we come to the conclusion that the safest bet was to just use the user's shell. Anything more just opens up more edge-cases than it solves. Co-Authored-By: Ryan * Use `platform_id` in doctor This will bring it in line with the new code. Co-authored-by: skullydazed Co-authored-by: skullY Co-authored-by: Ryan --- lib/python/qmk/tests/test_cli_commands.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/python/qmk/tests') diff --git a/lib/python/qmk/tests/test_cli_commands.py b/lib/python/qmk/tests/test_cli_commands.py index a2595eb788..3b4e66a211 100644 --- a/lib/python/qmk/tests/test_cli_commands.py +++ b/lib/python/qmk/tests/test_cli_commands.py @@ -1,9 +1,10 @@ import subprocess +from qmk.commands import run def check_subcommand(command, *args): cmd = ['bin/qmk', command] + list(args) - return subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True) + return run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True) def test_cformat(): -- cgit v1.2.3