Browse Source

Correctly resolve keyboard alias during 'qmk new-keymap' (#25570)

Joel Challis 6 months ago
parent
commit
5dd5d4dd60
1 changed files with 8 additions and 4 deletions
  1. 8 4
      lib/python/qmk/cli/new/keymap.py

+ 8 - 4
lib/python/qmk/cli/new/keymap.py

@@ -57,7 +57,13 @@ def prompt_keyboard():
 If you're unsure you can view a full list of supported keyboards with {fg_yellow}qmk list-keyboards{style_reset_all}.
 
 Keyboard Name? """
-    return question(prompt)
+    kb_name = question(prompt)
+
+    try:
+        # Resolve any keyboard alias
+        return keyboard_folder(kb_name)
+    except ValueError:
+        return None
 
 
 def prompt_user():
@@ -105,9 +111,7 @@ def new_keymap(cli):
     converter = cli.config.new_keymap.converter if cli.args.skip_converter or cli.config.new_keymap.converter else prompt_converter(kb_name)
 
     # check directories
-    try:
-        kb_name = keyboard_folder(kb_name)
-    except ValueError:
+    if not is_keyboard(kb_name):
         cli.log.error(f'Keyboard {{fg_cyan}}{kb_name}{{fg_reset}} does not exist! Please choose a valid name.')
         return False