From 2316a34ce9523d74824ae1e279f7f8c49dc3bd16 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Wed, 28 May 2025 23:13:37 +1000 Subject: [PATCH] Hope this works. (#209) --- qmk_cli/script_qmk.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/qmk_cli/script_qmk.py b/qmk_cli/script_qmk.py index d7cf476..0a0203e 100644 --- a/qmk_cli/script_qmk.py +++ b/qmk_cli/script_qmk.py @@ -13,7 +13,7 @@ from traceback import print_exc import milc from . import __version__ -from .helpers import find_qmk_firmware, is_qmk_firmware, find_qmk_userspace +from .helpers import find_qmk_firmware, is_qmk_firmware, find_qmk_userspace, is_qmk_userspace milc.cli.milc_options(version=__version__) milc.EMOJI_LOGLEVELS['INFO'] = '{fg_blue}Ψ{style_reset_all}' @@ -73,7 +73,10 @@ def main(): # Environment setup qmk_userspace = find_qmk_userspace() qmk_firmware = find_qmk_firmware() - os.environ['QMK_USERSPACE'] = str(qmk_userspace) + if is_qmk_userspace(qmk_userspace): + os.environ['QMK_USERSPACE'] = str(qmk_userspace) + elif 'QMK_USERSPACE' in os.environ: # Failed to find valid userspace, including what was in the environment if specified -- wipe any environment variable if present as it's clearly invalid. + os.environ.pop('QMK_USERSPACE') os.environ['QMK_HOME'] = str(qmk_firmware) os.environ['ORIG_CWD'] = os.getcwd()