x/qmk_firmware
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
QMK Bot
2023-11-28 14:07:50 +00:00
parent 2450fe28ee 049e964e61
commit a2c745cae8
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/python/qmk/userspace.py
View File

@@ -15,6 +15,7 @@ def qmk_userspace_paths():
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():
@@ -23,7 +24,7 @@ def qmk_userspace_paths():
# If we have a QMK_USERSPACE environment variable, use that
if environ.get('QMK_USERSPACE') is not None:
current_dir = Path(environ.get('QMK_USERSPACE'))
current_dir = Path(environ['QMK_USERSPACE'])
if current_dir.is_dir():
test_dirs.append(current_dir)