fix: shell split command args
This commit is contained in:
		
							parent
							
								
									c36977c3fa
								
							
						
					
					
						commit
						befcf4931d
					
				|  | @ -1,4 +1,5 @@ | ||||||
| import hashlib | import hashlib | ||||||
|  | import shlex | ||||||
| import socket | import socket | ||||||
| 
 | 
 | ||||||
| from joj3_config_generator.models import joj1, repo, result, task | from joj3_config_generator.models import joj1, repo, result, task | ||||||
|  | @ -48,7 +49,7 @@ def getHealthcheckCmd(repo_conf: repo.Config) -> result.Cmd: | ||||||
|     args = args + immutable_files |     args = args + immutable_files | ||||||
| 
 | 
 | ||||||
|     cmd = result.Cmd( |     cmd = result.Cmd( | ||||||
|         args=args.split(), |         args=shlex.split(args), | ||||||
|         # FIXME: easier to edit within global scope |         # FIXME: easier to edit within global scope | ||||||
|         copy_in={ |         copy_in={ | ||||||
|             f"./repo-health-checker": result.CmdFile(src=f"./repo-health-checker") |             f"./repo-health-checker": result.CmdFile(src=f"./repo-health-checker") | ||||||
|  |  | ||||||
|  | @ -1,3 +1,4 @@ | ||||||
|  | import shlex | ||||||
| from typing import Any, Dict, Tuple | from typing import Any, Dict, Tuple | ||||||
| 
 | 
 | ||||||
| import rtoml | import rtoml | ||||||
|  | @ -59,7 +60,11 @@ def get_executorWithConfig( | ||||||
|     ) |     ) | ||||||
|     executor_with_config = result.ExecutorWith( |     executor_with_config = result.ExecutorWith( | ||||||
|         default=result.Cmd( |         default=result.Cmd( | ||||||
|             args=(task_stage.command.split() if task_stage.command is not None else []), |             args=( | ||||||
|  |                 shlex.split(task_stage.command) | ||||||
|  |                 if task_stage.command is not None | ||||||
|  |                 else [] | ||||||
|  |             ), | ||||||
|             copy_in={ |             copy_in={ | ||||||
|                 file: result.CmdFile(src=f"/home/tt/.config/joj/{file}") |                 file: result.CmdFile(src=f"/home/tt/.config/joj/{file}") | ||||||
|                 for file in copy_in_files |                 for file in copy_in_files | ||||||
|  |  | ||||||
|  | @ -531,11 +531,7 @@ | ||||||
|                         "default": { |                         "default": { | ||||||
|                             "args": [ |                             "args": [ | ||||||
|                                 "cppcheck", |                                 "cppcheck", | ||||||
|                                 "--template='{\"file\":\"{file}\",\"line\":{line},", |                                 "--template={\"file\":\"{file}\",\"line\":{line}, \"column\":{column}, \"severity\":\"{severity}\", \"message\":\"{message}\", \"id\":\"{id}\"}", | ||||||
|                                 "\"column\":{column},", |  | ||||||
|                                 "\"severity\":\"{severity}\",", |  | ||||||
|                                 "\"message\":\"{message}\",", |  | ||||||
|                                 "\"id\":\"{id}\"}'", |  | ||||||
|                                 "--force", |                                 "--force", | ||||||
|                                 "--enable=all", |                                 "--enable=all", | ||||||
|                                 "--suppress=missingIncludeSystem", |                                 "--suppress=missingIncludeSystem", | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue
	
	Block a user