Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
c7a58bf280
1 changed files with 5 additions and 5 deletions
|
@ -12,29 +12,29 @@ from qmk.json_encoders import UserspaceJSONEncoder
|
|||
|
||||
|
||||
def qmk_userspace_paths():
|
||||
test_dirs = []
|
||||
test_dirs = {}
|
||||
|
||||
# If we're already in a directory with a qmk.json and a keyboards or layouts directory, interpret it as userspace
|
||||
if environ.get('ORIG_CWD') is not None:
|
||||
current_dir = Path(environ['ORIG_CWD'])
|
||||
while len(current_dir.parts) > 1:
|
||||
if (current_dir / 'qmk.json').is_file():
|
||||
test_dirs.append(current_dir)
|
||||
test_dirs[current_dir] = True
|
||||
current_dir = current_dir.parent
|
||||
|
||||
# If we have a QMK_USERSPACE environment variable, use that
|
||||
if environ.get('QMK_USERSPACE') is not None:
|
||||
current_dir = Path(environ['QMK_USERSPACE'])
|
||||
if current_dir.is_dir():
|
||||
test_dirs.append(current_dir)
|
||||
test_dirs[current_dir] = True
|
||||
|
||||
# If someone has configured a directory, use that
|
||||
if cli.config.user.overlay_dir is not None:
|
||||
current_dir = Path(cli.config.user.overlay_dir)
|
||||
if current_dir.is_dir():
|
||||
test_dirs.append(current_dir)
|
||||
test_dirs[current_dir] = True
|
||||
|
||||
return test_dirs
|
||||
return list(test_dirs.keys())
|
||||
|
||||
|
||||
def qmk_userspace_validate(path):
|
||||
|
|
Loading…
Reference in a new issue