aboutsummaryrefslogtreecommitdiff
path: root/lib/python/qmk/cli/json/keymap.py
diff options
context:
space:
mode:
authorskullydazed <skullydazed@users.noreply.github.com>2019-07-15 15:12:35 -0700
committerGitHub <noreply@github.com>2019-07-15 15:12:35 -0700
commit7d557a0514e2cef42a3d460f6cc78771b5df0a30 (patch)
tree4c072963984da7702ddf84abda57b11c123c1f50 /lib/python/qmk/cli/json/keymap.py
parenta25dd58bc56b0c4010673723ac44eaff914979bb (diff)
downloadqmk_firmware-7d557a0514e2cef42a3d460f6cc78771b5df0a30.tar.gz
qmk_firmware-7d557a0514e2cef42a3d460f6cc78771b5df0a30.zip
Fix compiling json files. (#6340)
Diffstat (limited to 'lib/python/qmk/cli/json/keymap.py')
-rwxr-xr-xlib/python/qmk/cli/json/keymap.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/python/qmk/cli/json/keymap.py b/lib/python/qmk/cli/json/keymap.py
index 35fc8f9c0..e2d0b5809 100755
--- a/lib/python/qmk/cli/json/keymap.py
+++ b/lib/python/qmk/cli/json/keymap.py
@@ -28,8 +28,8 @@ def main(cli):
28 exit(1) 28 exit(1)
29 29
30 # Environment processing 30 # Environment processing
31 if cli.args.output == ('-'): 31 if cli.config.general.output == ('-'):
32 cli.args.output = None 32 cli.config.general.output = None
33 33
34 # Parse the configurator json 34 # Parse the configurator json
35 with open(qmk.path.normpath(cli.args.filename), 'r') as fd: 35 with open(qmk.path.normpath(cli.args.filename), 'r') as fd:
@@ -38,17 +38,17 @@ def main(cli):
38 # Generate the keymap 38 # Generate the keymap
39 keymap_c = qmk.keymap.generate(user_keymap['keyboard'], user_keymap['layout'], user_keymap['layers']) 39 keymap_c = qmk.keymap.generate(user_keymap['keyboard'], user_keymap['layout'], user_keymap['layers'])
40 40
41 if cli.args.output: 41 if cli.config.general.output:
42 output_dir = os.path.dirname(cli.args.output) 42 output_dir = os.path.dirname(cli.config.general.output)
43 43
44 if not os.path.exists(output_dir): 44 if not os.path.exists(output_dir):
45 os.makedirs(output_dir) 45 os.makedirs(output_dir)
46 46
47 output_file = qmk.path.normpath(cli.args.output) 47 output_file = qmk.path.normpath(cli.config.general.output)
48 with open(output_file, 'w') as keymap_fd: 48 with open(output_file, 'w') as keymap_fd:
49 keymap_fd.write(keymap_c) 49 keymap_fd.write(keymap_c)
50 50
51 cli.log.info('Wrote keymap to %s.', cli.args.output) 51 cli.log.info('Wrote keymap to %s.', cli.config.general.output)
52 52
53 else: 53 else:
54 print(keymap_c) 54 print(keymap_c)