diff options
| -rw-r--r-- | nimterop/build.nim | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/nimterop/build.nim b/nimterop/build.nim index c1eb7ee..b2fbc48 100644 --- a/nimterop/build.nim +++ b/nimterop/build.nim @@ -1,4 +1,4 @@ -import macros, osproc, sets, strformat, strutils, tables +import macros, osproc, sets, strformat, strutils, regex, tables import os except findExe, sleep @@ -29,13 +29,13 @@ proc execAction*(cmd: string, retry = 0, nostderr = false): string = ccmd = "" ret = 0 when defined(Windows): - var filteredCmd = cmd - if cmd.startsWith("cd"): - var - colonIndex = cmd.find(":") - driveLetter = cmd.substr(colonIndex-1, colonIndex) - if driveLetter[0].isAlphaAscii() and driveLetter[1] == ':': - filteredCmd = &"{driveLetter} && {cmd}" + var + filteredCmd = cmd + matches: RegexMatch + if cmd.find(re"cd\s+(\D)\:", matches): + var driveLetter = cmd[matches.group(0)[0]] + filteredCmd = &"{driveLetter}: && {cmd}" + echo filteredCmd ccmd = "cmd /c " & filteredCmd elif defined(posix): ccmd = cmd |