Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
31eb82c911
|
@ -2,6 +2,7 @@
|
||||||
"""
|
"""
|
||||||
import sys
|
import sys
|
||||||
import os
|
import os
|
||||||
|
import subprocess
|
||||||
|
|
||||||
from milc import cli
|
from milc import cli
|
||||||
|
|
||||||
|
@ -41,6 +42,6 @@ def cd(cli):
|
||||||
# Set the prompt for the new shell
|
# Set the prompt for the new shell
|
||||||
qmk_env['MSYS2_PS1'] = qmk_env['PS1']
|
qmk_env['MSYS2_PS1'] = qmk_env['PS1']
|
||||||
# Start the new subshell
|
# Start the new subshell
|
||||||
cli.run([os.environ.get('SHELL', '/usr/bin/bash')], env=qmk_env)
|
subprocess.run([os.environ.get('SHELL', '/usr/bin/bash')], env=qmk_env)
|
||||||
else:
|
else:
|
||||||
cli.log.info("Already within qmk_firmware directory.")
|
cli.log.info("Already within qmk_firmware directory.")
|
||||||
|
|
Loading…
Reference in New Issue