sporq/qmk-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse Source
This commit is contained in:
QMK Bot 2021-02-28 20:19:42 +00:00
commit 80e8e20a89
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/python/qmk/cli/c2json.py
View File

@ -47,7 +47,7 @@ def c2json(cli):
if cli.args.output: if cli.args.output:
cli.args.output.parent.mkdir(parents=True, exist_ok=True) cli.args.output.parent.mkdir(parents=True, exist_ok=True)
if cli.args.output.exists(): if cli.args.output.exists():
cli.args.output.replace(cli.args.output.name + '.bak') cli.args.output.replace(cli.args.output.parent / (cli.args.output.name + '.bak'))
cli.args.output.write_text(json.dumps(keymap_json, cls=InfoJSONEncoder)) cli.args.output.write_text(json.dumps(keymap_json, cls=InfoJSONEncoder))
if not cli.args.quiet: if not cli.args.quiet:

4
lib/python/qmk/cli/generate/config_h.py
View File

@ -82,7 +82,7 @@ def generate_config_h(cli):
""" """
# Determine our keyboard(s) # Determine our keyboard(s)
if not cli.config.generate_config_h.keyboard: if not cli.config.generate_config_h.keyboard:
cli.log.error('Missing paramater: --keyboard') cli.log.error('Missing parameter: --keyboard')
cli.subcommands['info'].print_help() cli.subcommands['info'].print_help()
return False return False
@ -142,7 +142,7 @@ def generate_config_h(cli):
if cli.args.output: if cli.args.output:
cli.args.output.parent.mkdir(parents=True, exist_ok=True) cli.args.output.parent.mkdir(parents=True, exist_ok=True)
if cli.args.output.exists(): if cli.args.output.exists():
cli.args.output.replace(cli.args.output.name + '.bak') cli.args.output.replace(cli.args.output.parent / (cli.args.output.name + '.bak'))
cli.args.output.write_text(config_h) cli.args.output.write_text(config_h)
if not cli.args.quiet: if not cli.args.quiet:

4
lib/python/qmk/cli/generate/layouts.py
View File

@ -25,7 +25,7 @@ def generate_layouts(cli):
""" """
# Determine our keyboard(s) # Determine our keyboard(s)
if not cli.config.generate_layouts.keyboard: if not cli.config.generate_layouts.keyboard:
cli.log.error('Missing paramater: --keyboard') cli.log.error('Missing parameter: --keyboard')
cli.subcommands['info'].print_help() cli.subcommands['info'].print_help()
return False return False
@ -92,7 +92,7 @@ def generate_layouts(cli):
if cli.args.output: if cli.args.output:
cli.args.output.parent.mkdir(parents=True, exist_ok=True) cli.args.output.parent.mkdir(parents=True, exist_ok=True)
if cli.args.output.exists(): if cli.args.output.exists():
cli.args.output.replace(cli.args.output.name + '.bak') cli.args.output.replace(cli.args.output.parent / (cli.args.output.name + '.bak'))
cli.args.output.write_text(layouts_h) cli.args.output.write_text(layouts_h)
if not cli.args.quiet: if not cli.args.quiet:

2
lib/python/qmk/cli/generate/rgb_breathe_table.py
View File

@ -70,7 +70,7 @@ static const int table_scale = 256 / sizeof(rgblight_effect_breathe_table);
if cli.args.output: if cli.args.output:
cli.args.output.parent.mkdir(parents=True, exist_ok=True) cli.args.output.parent.mkdir(parents=True, exist_ok=True)
if cli.args.output.exists(): if cli.args.output.exists():
cli.args.output.replace(cli.args.output.name + '.bak') cli.args.output.replace(cli.args.output.parent / (cli.args.output.name + '.bak'))
cli.args.output.write_text(table_template) cli.args.output.write_text(table_template)
if not cli.args.quiet: if not cli.args.quiet:

4
lib/python/qmk/cli/generate/rules_mk.py
View File

@ -44,7 +44,7 @@ def generate_rules_mk(cli):
"""Generates a rules.mk file from info.json. """Generates a rules.mk file from info.json.
""" """
if not cli.config.generate_rules_mk.keyboard: if not cli.config.generate_rules_mk.keyboard:
cli.log.error('Missing paramater: --keyboard') cli.log.error('Missing parameter: --keyboard')
cli.subcommands['info'].print_help() cli.subcommands['info'].print_help()
return False return False
@ -79,7 +79,7 @@ def generate_rules_mk(cli):
if cli.args.output: if cli.args.output:
cli.args.output.parent.mkdir(parents=True, exist_ok=True) cli.args.output.parent.mkdir(parents=True, exist_ok=True)
if cli.args.output.exists(): if cli.args.output.exists():
cli.args.output.replace(cli.args.output.name + '.bak') cli.args.output.replace(cli.args.output.parent / (cli.args.output.name + '.bak'))
cli.args.output.write_text(rules_mk) cli.args.output.write_text(rules_mk)
if cli.args.quiet: if cli.args.quiet:

2
lib/python/qmk/cli/json2c.py
View File

@ -37,7 +37,7 @@ def json2c(cli):
if cli.args.output: if cli.args.output:
cli.args.output.parent.mkdir(parents=True, exist_ok=True) cli.args.output.parent.mkdir(parents=True, exist_ok=True)
if cli.args.output.exists(): if cli.args.output.exists():
cli.args.output.replace(cli.args.output.name + '.bak') cli.args.output.replace(cli.args.output.parent / (cli.args.output.name + '.bak'))
cli.args.output.write_text(keymap_c) cli.args.output.write_text(keymap_c)
if not cli.args.quiet: if not cli.args.quiet: