diff options
| author | Zach White <skullydazed@gmail.com> | 2021-03-07 19:10:03 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-07 19:10:03 -0800 |
| commit | b0069c5c05dac2c910d51ef7f3bf4133721a9c49 (patch) | |
| tree | ea8a7afb278f0ab4adb2e5390ef952c569ce3592 /lib | |
| parent | 7d45b7f269ddcfc1b33a55d8fed77bdfbf81ba8b (diff) | |
| download | qmk_firmware-b0069c5c05dac2c910d51ef7f3bf4133721a9c49.tar.gz qmk_firmware-b0069c5c05dac2c910d51ef7f3bf4133721a9c49.zip | |
Begin the process of deprecating bin/qmk in favor of the global cli (#12109)
* Begin the process of deprecating bin/qmk in favor of the global cli
* Correctly set the qmk bin
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/python/qmk/commands.py | 1 | ||||
| -rw-r--r-- | lib/python/qmk/tests/test_cli_commands.py | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/python/qmk/commands.py b/lib/python/qmk/commands.py index 3c6f0d001..233d1034b 100644 --- a/lib/python/qmk/commands.py +++ b/lib/python/qmk/commands.py | |||
| @@ -180,6 +180,7 @@ def compile_configurator_json(user_keymap, bootloader=None, parallel=1, **env_va | |||
| 180 | f'VERBOSE={verbose}', | 180 | f'VERBOSE={verbose}', |
| 181 | f'COLOR={color}', | 181 | f'COLOR={color}', |
| 182 | 'SILENT=false', | 182 | 'SILENT=false', |
| 183 | 'QMK_BIN=qmk', | ||
| 183 | ]) | 184 | ]) |
| 184 | 185 | ||
| 185 | return make_command | 186 | return make_command |
diff --git a/lib/python/qmk/tests/test_cli_commands.py b/lib/python/qmk/tests/test_cli_commands.py index 82c42a20e..bfecebdd7 100644 --- a/lib/python/qmk/tests/test_cli_commands.py +++ b/lib/python/qmk/tests/test_cli_commands.py | |||
| @@ -8,7 +8,7 @@ is_windows = 'windows' in platform.platform().lower() | |||
| 8 | 8 | ||
| 9 | 9 | ||
| 10 | def check_subcommand(command, *args): | 10 | def check_subcommand(command, *args): |
| 11 | cmd = ['bin/qmk', command, *args] | 11 | cmd = ['qmk', command, *args] |
| 12 | result = run(cmd, stdout=PIPE, stderr=STDOUT, universal_newlines=True) | 12 | result = run(cmd, stdout=PIPE, stderr=STDOUT, universal_newlines=True) |
| 13 | return result | 13 | return result |
| 14 | 14 | ||
| @@ -17,7 +17,7 @@ def check_subcommand_stdin(file_to_read, command, *args): | |||
| 17 | """Pipe content of a file to a command and return output. | 17 | """Pipe content of a file to a command and return output. |
| 18 | """ | 18 | """ |
| 19 | with open(file_to_read, encoding='utf-8') as my_file: | 19 | with open(file_to_read, encoding='utf-8') as my_file: |
| 20 | cmd = ['bin/qmk', command, *args] | 20 | cmd = ['qmk', command, *args] |
| 21 | result = run(cmd, stdin=my_file, stdout=PIPE, stderr=STDOUT, universal_newlines=True) | 21 | result = run(cmd, stdin=my_file, stdout=PIPE, stderr=STDOUT, universal_newlines=True) |
| 22 | return result | 22 | return result |
| 23 | 23 | ||
