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

Removed the regex stuff

Browse source
This commit is contained in:
matkuki 2019-10-23 16:53:43 +02:00 • committed by GitHub
commit 3765862b6e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
nimterop/build.nim
View file

@ -1,4 +1,4 @@
import macros, osproc, sets, strformat, strutils, regex, tables import macros, osproc, sets, strformat, strutils, tables
import os except findExe, sleep import os except findExe, sleep
@ -29,13 +29,15 @@ proc execAction*(cmd: string, retry = 0, nostderr = false): string =
ccmd = "" ccmd = ""
ret = 0 ret = 0
when defined(Windows): when defined(Windows):
var filteredCmd = cmd
if cmd.toLower().startsWith("cd"):
var var
filteredCmd = cmd colonIndex = cmd.find(":")
matches: RegexMatch driveLetter = cmd.substr(colonIndex-1, colonIndex)
if cmd.find(re"cd\s+(\D)\:", matches): if (driveLetter[0].isAlphaAscii() and
var driveLetter = cmd[matches.group(0)[0]] driveLetter[1] == ':' and
filteredCmd = &"{driveLetter}: && {cmd}" colonIndex == 4):
echo filteredCmd filteredCmd = &"{driveLetter} && {cmd}"
ccmd = "cmd /c " & filteredCmd ccmd = "cmd /c " & filteredCmd
elif defined(posix): elif defined(posix):
ccmd = cmd ccmd = cmd