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

3 files changed, 10 insertions, 1 deletions

diff --git a/lib/python/qmk/cli/__init__.py b/lib/python/qmk/cli/__init__.py
index b656909f85..a64f90c29b 100644
--- a/lib/python/qmk/cli/__init__.py
+++ b/lib/python/qmk/cli/__init__.py
@@ -87,6 +87,7 @@ subcommands = [
     'qmk.cli.userspace.compile',
     'qmk.cli.userspace.doctor',
     'qmk.cli.userspace.list',
+    'qmk.cli.userspace.path',
     'qmk.cli.userspace.remove',
     'qmk.cli.via2json',
 ]
diff --git a/lib/python/qmk/cli/userspace/path.py b/lib/python/qmk/cli/userspace/path.py
new file mode 100755
index 0000000000..df4648e8c7
--- /dev/null
+++ b/lib/python/qmk/cli/userspace/path.py
@@ -0,0 +1,8 @@
+from milc import cli
+from qmk.constants import QMK_USERSPACE
+
+
+@cli.subcommand('Detected path to QMK Userspace.', hidden=True)
+def userspace_path(cli):
+    print(QMK_USERSPACE)
+    return
diff --git a/lib/python/qmk/tests/test_cli_commands.py b/lib/python/qmk/tests/test_cli_commands.py
index 1725e3ea79..8b50d1c340 100644
--- a/lib/python/qmk/tests/test_cli_commands.py
+++ b/lib/python/qmk/tests/test_cli_commands.py
@@ -249,7 +249,7 @@ def test_c2json_nocpp_stdin():
 def test_clean():
     result = check_subcommand('clean', '-a')
     check_returncode(result)
-    assert result.stdout.count('done') == 2
+    assert (result.stdout.count('done') == 2 and 'userspace' not in result.stdout) or (result.stdout.count('done') == 3 and 'userspace' in result.stdout)
 
 
 def test_generate_api():