Rename execute to pipe

This commit is contained in:
Joey Yakimowich-Payne 2018-06-27 22:22:38 +09:00
commit a7edd8525d
2 changed files with 10 additions and 9 deletions

View file

@ -143,7 +143,7 @@ The following keys apply to library source code (before processing) and generate
```search``` = search string providing context for following prepend/append/replace directives
```execute``` = execute a command on a file and store the output of the command as the new file contents. Ex: execute = "cat $file | grep 'static inline'"
```pipe``` = execute a command on a file and store the output of the command as the new file contents. Ex: pipe = "cat $file | grep 'static inline'"
```prepend``` = string value to prepend into file at beginning or before search

View file

@ -228,11 +228,12 @@ proc prepend(file: string, data: string, search="") =
if idx != -1:
content = content[0..<idx] & data & content[idx..<content.len()]
proc execute(file: string, command: string) =
withFile(file):
let cmd = command % ["file", file]
let commandResult = execProc(cmd)
content = commandResult
proc pipe(file: string, command: string) =
let cmd = command % ["file", file]
let commandResult = execProc(cmd).strip()
if commandResult != "":
withFile(file):
content = commandResult
proc append(file: string, data: string, search="") =
withFile(file):
@ -593,7 +594,7 @@ proc runFile(file: string, cfgin: OrderedTableRef) =
if action == "create":
createDir(file.splitPath().head)
writeFile(file, cfg[act])
elif action in @["prepend", "append", "replace", "comment", "rename", "compile", "dynlib", "pragma", "execute"] and sfile != "":
elif action in @["prepend", "append", "replace", "comment", "rename", "compile", "dynlib", "pragma", "pipe"] and sfile != "":
if action == "prepend":
if srch != "":
prepend(sfile, cfg[act], cfg[srch])
@ -618,8 +619,8 @@ proc runFile(file: string, cfgin: OrderedTableRef) =
c2nimConfig.dynlib.add(cfg[act])
elif action == "pragma":
c2nimConfig.pragma.add(cfg[act])
elif action == "execute":
execute(sfile, cfg[act])
elif action == "pipe":
pipe(sfile, cfg[act])
srch = ""
elif action == "search":
srch = act