ollien/qmk_firmware_2
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse source
This commit is contained in:
QMK Bot 2024-05-16 23:06:50 +00:00
parent a9ba83c7be 340be4bae3
commit b1ed1c6082
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/python/qmk/userspace.py
View file

@ -12,29 +12,29 @@ from qmk.json_encoders import UserspaceJSONEncoder
def qmk_userspace_paths(): def qmk_userspace_paths():
test_dirs = {} test_dirs = set()
# If we're already in a directory with a qmk.json and a keyboards or layouts directory, interpret it as userspace # 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: if environ.get('ORIG_CWD') is not None:
current_dir = Path(environ['ORIG_CWD']) current_dir = Path(environ['ORIG_CWD'])
while len(current_dir.parts) > 1: while len(current_dir.parts) > 1:
if (current_dir / 'qmk.json').is_file(): if (current_dir / 'qmk.json').is_file():
test_dirs[current_dir] = True test_dirs.add(current_dir)
current_dir = current_dir.parent current_dir = current_dir.parent
# If we have a QMK_USERSPACE environment variable, use that # If we have a QMK_USERSPACE environment variable, use that
if environ.get('QMK_USERSPACE') is not None: if environ.get('QMK_USERSPACE') is not None:
current_dir = Path(environ['QMK_USERSPACE']) current_dir = Path(environ['QMK_USERSPACE']).expanduser()
if current_dir.is_dir(): if current_dir.is_dir():
test_dirs[current_dir] = True test_dirs.add(current_dir)
# If someone has configured a directory, use that # If someone has configured a directory, use that
if cli.config.user.overlay_dir is not None: if cli.config.user.overlay_dir is not None:
current_dir = Path(cli.config.user.overlay_dir) current_dir = Path(cli.config.user.overlay_dir).expanduser().resolve()
if current_dir.is_dir(): if current_dir.is_dir():
test_dirs[current_dir] = True test_dirs.add(current_dir)
return list(test_dirs.keys()) return list(test_dirs)
def qmk_userspace_validate(path): def qmk_userspace_validate(path):