c89c084146
* CLI: More MSYS2 fixes Now I can fully setup and work with qmk_firmware on an MSYS2 installation without any errors or exceptions. * Apply suggestions from code review Co-Authored-By: skullydazed <skullydazed@users.noreply.github.com> * Some improvements * Remove unnecessary import * Remove slow, unused code Getting the version from GIT was slow on both Windows and Docker. Until we find a better, faster way, this is removed. * remove unused imports * Implement @vomindoraan's suggestions * refine how we pick the shell to use * Apply @fauxpark's suggestions fauxpark investigated the topic of shells in MSYS2 a bit and we come to the conclusion that the safest bet was to just use the user's shell. Anything more just opens up more edge-cases than it solves. Co-Authored-By: Ryan <fauxpark@gmail.com> * Use `platform_id` in doctor This will bring it in line with the new code. Co-authored-by: skullydazed <skullydazed@users.noreply.github.com> Co-authored-by: skullY <skullydazed@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
84 lines
2.0 KiB
Python
84 lines
2.0 KiB
Python
"""Helper functions for commands.
|
|
"""
|
|
import json
|
|
import os
|
|
import platform
|
|
import subprocess
|
|
import shlex
|
|
|
|
import qmk.keymap
|
|
|
|
|
|
def create_make_command(keyboard, keymap, target=None):
|
|
"""Create a make compile command
|
|
|
|
Args:
|
|
|
|
keyboard
|
|
The path of the keyboard, for example 'plank'
|
|
|
|
keymap
|
|
The name of the keymap, for example 'algernon'
|
|
|
|
target
|
|
Usually a bootloader.
|
|
|
|
Returns:
|
|
|
|
A command that can be run to make the specified keyboard and keymap
|
|
"""
|
|
make_args = [keyboard, keymap]
|
|
|
|
if target:
|
|
make_args.append(target)
|
|
|
|
return ['make', ':'.join(make_args)]
|
|
|
|
|
|
def compile_configurator_json(user_keymap, bootloader=None):
|
|
"""Convert a configurator export JSON file into a C file
|
|
|
|
Args:
|
|
|
|
configurator_filename
|
|
The configurator JSON export file
|
|
|
|
bootloader
|
|
A bootloader to flash
|
|
|
|
Returns:
|
|
|
|
A command to run to compile and flash the C file.
|
|
"""
|
|
# Write the keymap C file
|
|
qmk.keymap.write(user_keymap['keyboard'], user_keymap['keymap'], user_keymap['layout'], user_keymap['layers'])
|
|
|
|
# Return a command that can be run to make the keymap and flash if given
|
|
if bootloader is None:
|
|
return create_make_command(user_keymap['keyboard'], user_keymap['keymap'])
|
|
return create_make_command(user_keymap['keyboard'], user_keymap['keymap'], bootloader)
|
|
|
|
|
|
def parse_configurator_json(configurator_file):
|
|
"""Open and parse a configurator json export
|
|
"""
|
|
user_keymap = json.load(configurator_file)
|
|
|
|
return user_keymap
|
|
|
|
|
|
def run(command, *args, **kwargs):
|
|
"""Run a command with subprocess.run
|
|
"""
|
|
platform_id = platform.platform().lower()
|
|
|
|
if isinstance(command, str):
|
|
raise TypeError('`command` must be a non-text sequence such as list or tuple.')
|
|
|
|
if 'windows' in platform_id:
|
|
safecmd = map(shlex.quote, command)
|
|
safecmd = ' '.join(safecmd)
|
|
command = [os.environ['SHELL'], '-c', safecmd]
|
|
|
|
return subprocess.run(command, *args, **kwargs)
|