aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSt. John Johnson <st.john.johnson@gmail.com>2019-10-05 23:41:15 -0700
committerskullydazed <skullydazed@users.noreply.github.com>2019-10-05 23:41:15 -0700
commit78f01eef2e4586f59b56703d0a4f1a57a1af40a1 (patch)
tree59ff7577980e1f8e39d0a945aa533e92f3e0945a
parentf3f7f941dc7627ea8cdeb00b73c72bff3739de15 (diff)
downloadqmk_firmware-78f01eef2e4586f59b56703d0a4f1a57a1af40a1.tar.gz
qmk_firmware-78f01eef2e4586f59b56703d0a4f1a57a1af40a1.zip
Use `keymap` instead of `username` variable for `qmk new_keymap` (#6885)
Username is not defined and this causes `qmk new_keymap` to error. This appears to have originated from a partial update in https://github.com/qmk/qmk_firmware/pull/6708/files#diff-d5208bcbc79aa428556a743b6ff41086. This change completes the migration from `username` to `keymap`
-rwxr-xr-xlib/python/qmk/cli/new/keymap.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/python/qmk/cli/new/keymap.py b/lib/python/qmk/cli/new/keymap.py
index 5efb81c93..96525e28e 100755
--- a/lib/python/qmk/cli/new/keymap.py
+++ b/lib/python/qmk/cli/new/keymap.py
@@ -12,14 +12,14 @@ from milc import cli
12def new_keymap(cli): 12def new_keymap(cli):
13 """Creates a new keymap for the keyboard of your choosing. 13 """Creates a new keymap for the keyboard of your choosing.
14 """ 14 """
15 # ask for user input if keyboard or username was not provided in the command line 15 # ask for user input if keyboard or keymap was not provided in the command line
16 keyboard = cli.config.new_keymap.keyboard if cli.config.new_keymap.keyboard else input("Keyboard Name: ") 16 keyboard = cli.config.new_keymap.keyboard if cli.config.new_keymap.keyboard else input("Keyboard Name: ")
17 keymap = cli.config.new_keymap.keymap if cli.config.new_keymap.keymap else input("Keymap Name: ") 17 keymap = cli.config.new_keymap.keymap if cli.config.new_keymap.keymap else input("Keymap Name: ")
18 18
19 # generate keymap paths 19 # generate keymap paths
20 kb_path = os.path.join(os.getcwd(), "keyboards", keyboard) 20 kb_path = os.path.join(os.getcwd(), "keyboards", keyboard)
21 keymap_path_default = os.path.join(kb_path, "keymaps/default") 21 keymap_path_default = os.path.join(kb_path, "keymaps/default")
22 keymap_path = os.path.join(kb_path, "keymaps/%s" % username) 22 keymap_path = os.path.join(kb_path, "keymaps/%s" % keymap)
23 23
24 # check directories 24 # check directories
25 if not os.path.exists(kb_path): 25 if not os.path.exists(kb_path):
@@ -36,5 +36,5 @@ def new_keymap(cli):
36 shutil.copytree(keymap_path_default, keymap_path, symlinks=True) 36 shutil.copytree(keymap_path_default, keymap_path, symlinks=True)
37 37
38 # end message to user 38 # end message to user
39 cli.log.info("%s keymap directory created in: %s", username, keymap_path) 39 cli.log.info("%s keymap directory created in: %s", keymap, keymap_path)
40 cli.log.info("Compile a firmware with your new keymap by typing: \n" + "qmk compile -kb %s -km %s", keyboard, username) 40 cli.log.info("Compile a firmware with your new keymap by typing: \n" + "qmk compile -kb %s -km %s", keyboard, keymap)