jyapayne/nimterop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

execAction: quoting was not robust (in case cmd had quotes) and bash -c was redundant on posix (#117)

Browse source
This commit is contained in:
Timothee Cour 2019-02-08 13:59:41 -08:00 • committed by genotrance
commit 5226420474
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
nimterop/git.nim
View file

@ -8,18 +8,18 @@ proc execAction*(cmd: string, nostderr=false): string =
ret = 0
when defined(Windows):
ccmd = "cmd /c " & cmd
when defined(Linux) or defined(MacOSX):
ccmd = "bash -c \"" & cmd & "\""
elif defined(posix):
ccmd = cmd
else:
doAssert false
when nimvm:
(result, ret) = gorgeEx(ccmd)
else:
if nostderr:
(result, ret) = execCmdEx(ccmd, {poUsePath})
else:
(result, ret) = execCmdEx(ccmd)
let opt = if nostderr: {poUsePath} else: {poStdErrToStdOut, poUsePath}
(result, ret) = execCmdEx(ccmd, opt)
if ret != 0:
let msg = "Command failed: " & $ret & "\nccmd: " & ccmd & "\nresult:\n" & result
let msg = "Command failed: " & $(ret, nostderr) & "\nccmd: " & ccmd & "\nresult:\n" & result
doAssert false, msg
proc mkDir*(dir: string) =