Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						f12000a1b6
					
				
					 2 changed files with 4 additions and 2 deletions
				
			
		| 
						 | 
				
			
			@ -48,7 +48,8 @@ def compile(cli):
 | 
			
		|||
        cli.log.info('Compiling keymap with {fg_cyan}%s', ' '.join(command))
 | 
			
		||||
        if not cli.args.dry_run:
 | 
			
		||||
            cli.echo('\n')
 | 
			
		||||
            subprocess.run(command)
 | 
			
		||||
            compile = subprocess.run(command)
 | 
			
		||||
            return compile.returncode
 | 
			
		||||
 | 
			
		||||
    else:
 | 
			
		||||
        cli.log.error('You must supply a configurator export, both `--keyboard` and `--keymap`, or be in a directory for a keyboard or keymap.')
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -81,7 +81,8 @@ def flash(cli):
 | 
			
		|||
        cli.log.info('Compiling keymap with {fg_cyan}%s', ' '.join(command))
 | 
			
		||||
        if not cli.args.dry_run:
 | 
			
		||||
            cli.echo('\n')
 | 
			
		||||
            subprocess.run(command)
 | 
			
		||||
            compile = subprocess.run(command)
 | 
			
		||||
            return compile.returncode
 | 
			
		||||
 | 
			
		||||
    else:
 | 
			
		||||
        cli.log.error('You must supply a configurator export, both `--keyboard` and `--keymap`, or be in a directory for a keyboard or keymap.')
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue