summaryrefslogtreecommitdiff
path: root/lib/python/qmk/cli
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-08-29 23:47:04 +0000
committerQMK Bot <hello@qmk.fm>2021-08-29 23:47:04 +0000
commitb46064a891332db07643f73018910c031a63aa50 (patch)
tree216c9a4ad762f229706bdb116701d1a50788ee40 /lib/python/qmk/cli
parent92e606b927ba60a7154857918e2ba16049a880c1 (diff)
parentbaa423004a870b5cb86f4d1197dcda5f8b390f49 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'lib/python/qmk/cli')
-rw-r--r--lib/python/qmk/cli/__init__.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/python/qmk/cli/__init__.py b/lib/python/qmk/cli/__init__.py
index 318adf3785..292dcbe812 100644
--- a/lib/python/qmk/cli/__init__.py
+++ b/lib/python/qmk/cli/__init__.py
@@ -180,8 +180,14 @@ if int(milc_version[0]) < 2 and int(milc_version[1]) < 4:
print(f'Your MILC library is too old! Please upgrade: python3 -m pip install -U -r {str(requirements)}')
exit(127)
+# Make sure we can run binaries in the same directory as our Python interpreter
+python_dir = os.path.dirname(sys.executable)
+
+if python_dir not in os.environ['PATH'].split(':'):
+ os.environ['PATH'] = ":".join((python_dir, os.environ['PATH']))
+
# Check to make sure we have all our dependencies
-msg_install = 'Please run `python3 -m pip install -r %s` to install required python dependencies.'
+msg_install = f'Please run `{sys.executable} -m pip install -r %s` to install required python dependencies.'
args = sys.argv[1:]
while args and args[0][0] == '-':
del args[0]