g1smo
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
QMK Bot 2023-11-28 14:07:50 +00:00
parent 2450fe28ee 049e964e61
commit a2c745cae8
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,15 +15,16 @@ 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 we're already in a directory with a qmk.json and a keyboards or layouts directory, interpret it as userspace
current_dir = Path(environ['ORIG_CWD']) if environ.get('ORIG_CWD') is not None:
while len(current_dir.parts) > 1: current_dir = Path(environ['ORIG_CWD'])
if (current_dir / 'qmk.json').is_file(): while len(current_dir.parts) > 1:
test_dirs.append(current_dir) if (current_dir / 'qmk.json').is_file():
current_dir = current_dir.parent test_dirs.append(current_dir)
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.get('QMK_USERSPACE')) current_dir = Path(environ['QMK_USERSPACE'])
if current_dir.is_dir(): if current_dir.is_dir():
test_dirs.append(current_dir) test_dirs.append(current_dir)