gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-07-16 12:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't accidentally resolve qmk_firmware as userspace if it's the current working directory.

Browse Source
This commit is contained in:
Nick Brassel 2023-09-02 21:49:31 +10:00
parent 5477193489
commit da39824043
No known key found for this signature in database
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,8 @@ def _detect_qmk_userspace():
current_dir = Path(environ['ORIG_CWD'])
while len(current_dir.parts) > 1:
if (current_dir / 'Makefile').is_file() and ((current_dir / 'keyboards').is_dir() or (current_dir / 'layouts').is_dir()):
return current_dir
if current_dir.resolve() != Path(QMK_FIRMWARE).resolve():
return current_dir
current_dir = current_dir.parent
# Otherwise, use the environment variable or the configured default
return environ.get('QMK_USERSPACE') or cli.config.user.overlay_dir or QMK_FIRMWARE