Skip to content

Commit

Permalink
Resolve home directory in userspace config (qmk#23730)
Browse files Browse the repository at this point in the history
  • Loading branch information
zvecr authored and nuess0r committed Sep 8, 2024
1 parent 21ad319 commit efdc72c
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions lib/python/qmk/userspace.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,29 +12,29 @@


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 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[current_dir] = True
test_dirs.add(current_dir)
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'])
current_dir = Path(environ['QMK_USERSPACE']).expanduser()
if current_dir.is_dir():
test_dirs[current_dir] = True
test_dirs.add(current_dir)

# 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)
current_dir = Path(cli.config.user.overlay_dir).expanduser().resolve()
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):
Expand Down

0 comments on commit efdc72c

Please sign in to comment.