From 340be4bae34d35137b65f3c303f3091ede3c8938 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Fri, 17 May 2024 00:06:19 +0100 Subject: [PATCH] Resolve home directory in userspace config (#23730) --- lib/python/qmk/userspace.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/python/qmk/userspace.py b/lib/python/qmk/userspace.py index 7e4cb847c80..1e5823b2291 100644 --- a/lib/python/qmk/userspace.py +++ b/lib/python/qmk/userspace.py @@ -12,29 +12,29 @@ from qmk.json_encoders import UserspaceJSONEncoder 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):