Henry-Hiles/qmk_userspace
1
0
Fork 0
forked from mirrors/qmk_userspace
Code Pull requests Activity

Use keymap instead of username variable for qmk new_keymap (#6885)

Browse source 
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`
This commit is contained in:
St. John Johnson 2019-10-05 23:41:15 -07:00 • committed by skullydazed
commit 78f01eef2e
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/python/qmk/cli/new/keymap.py
View file

@ -12,14 +12,14 @@ from milc import cli
def new_keymap(cli): def new_keymap(cli):
"""Creates a new keymap for the keyboard of your choosing. """Creates a new keymap for the keyboard of your choosing.
""" """
# ask for user input if keyboard or username was not provided in the command line # ask for user input if keyboard or keymap was not provided in the command line
keyboard = cli.config.new_keymap.keyboard if cli.config.new_keymap.keyboard else input("Keyboard Name: ") keyboard = cli.config.new_keymap.keyboard if cli.config.new_keymap.keyboard else input("Keyboard Name: ")
keymap = cli.config.new_keymap.keymap if cli.config.new_keymap.keymap else input("Keymap Name: ") keymap = cli.config.new_keymap.keymap if cli.config.new_keymap.keymap else input("Keymap Name: ")
# generate keymap paths # generate keymap paths
kb_path = os.path.join(os.getcwd(), "keyboards", keyboard) kb_path = os.path.join(os.getcwd(), "keyboards", keyboard)
keymap_path_default = os.path.join(kb_path, "keymaps/default") keymap_path_default = os.path.join(kb_path, "keymaps/default")
keymap_path = os.path.join(kb_path, "keymaps/%s" % username) keymap_path = os.path.join(kb_path, "keymaps/%s" % keymap)
# check directories # check directories
if not os.path.exists(kb_path): if not os.path.exists(kb_path):
@ -36,5 +36,5 @@ def new_keymap(cli):
shutil.copytree(keymap_path_default, keymap_path, symlinks=True) shutil.copytree(keymap_path_default, keymap_path, symlinks=True)
# end message to user # end message to user
cli.log.info("%s keymap directory created in: %s", username, keymap_path) cli.log.info("%s keymap directory created in: %s", keymap, keymap_path)
cli.log.info("Compile a firmware with your new keymap by typing: \n" + "qmk compile -kb %s -km %s", keyboard, username) cli.log.info("Compile a firmware with your new keymap by typing: \n" + "qmk compile -kb %s -km %s", keyboard, keymap)