Merge remote-tracking branch 'origin/develop' into xap
This commit is contained in:
		
						commit
						b96b862ef9
					
				
					 389 changed files with 12110 additions and 1362 deletions
				
			
		| 
						 | 
				
			
			@ -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.")
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue