Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		@@ -2,6 +2,7 @@
 | 
			
		||||
"""
 | 
			
		||||
import sys
 | 
			
		||||
import os
 | 
			
		||||
import subprocess
 | 
			
		||||
 | 
			
		||||
from milc import cli
 | 
			
		||||
 | 
			
		||||
@@ -41,6 +42,6 @@ def cd(cli):
 | 
			
		||||
            # Set the prompt for the new shell
 | 
			
		||||
            qmk_env['MSYS2_PS1'] = qmk_env['PS1']
 | 
			
		||||
            # 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:
 | 
			
		||||
        cli.log.info("Already within qmk_firmware directory.")
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user