diff options
| author | Erovia <Erovia@users.noreply.github.com> | 2020-05-26 17:43:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-26 17:43:33 +0200 |
| commit | 6501377070ff20bd061ea85c7ae5517652b6478b (patch) | |
| tree | 5dd31794e887b98da40ed647405452a85c852f08 /lib/python/qmk/cli | |
| parent | af2ca136045c0157c5c093fb902dccacd9fa0e32 (diff) | |
| download | qmk_firmware-6501377070ff20bd061ea85c7ae5517652b6478b.tar.gz qmk_firmware-6501377070ff20bd061ea85c7ae5517652b6478b.zip | |
CLI: fix `json2c` subcommand and add/fix tests (#9206)
Co-authored-by: Zach White <skullydazed@users.noreply.github.com>
Diffstat (limited to 'lib/python/qmk/cli')
| -rwxr-xr-x | lib/python/qmk/cli/json2c.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/python/qmk/cli/json2c.py b/lib/python/qmk/cli/json2c.py index 5218405070..af0d80a9ac 100755 --- a/lib/python/qmk/cli/json2c.py +++ b/lib/python/qmk/cli/json2c.py @@ -18,19 +18,19 @@ def json2c(cli): This command uses the `qmk.keymap` module to generate a keymap.c from a configurator export. The generated keymap is written to stdout, or to a file if -o is provided. """ # Error checking - if not cli.args.filename.exists(): - cli.log.error('JSON file does not exist!') + if cli.args.filename and cli.args.filename.name == '-': + # TODO(skullydazed/anyone): Read file contents from STDIN + cli.log.error('Reading from STDIN is not (yet) supported.') cli.print_usage() exit(1) - if cli.args.filename.name == '-': - # TODO(skullydazed/anyone): Read file contents from STDIN - cli.log.error('Reading from STDIN is not (yet) supported.') + if not cli.args.filename.exists(): + cli.log.error('JSON file does not exist!') cli.print_usage() exit(1) # Environment processing - if cli.args.output.name == ('-'): + if cli.args.output and cli.args.output.name == '-': cli.args.output = None # Parse the configurator json |