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

Quote nim executable before executing. (#13316) [backport]

Browse source 
In case nim executable is located in PATH containing spaces.

fixes #13311
This commit is contained in:
Fredrik Høisæther Rasch 2020-02-02 13:54:48 +01:00 • committed by GitHub
commit dfecc3489b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
koch.nim
View file

@ -259,7 +259,7 @@ when false:
proc pdf(args="") = proc pdf(args="") =
exec("$# cc -r tools/nimweb.nim $# --pdf web/website.ini --putenv:nimversion=$#" % exec("$# cc -r tools/nimweb.nim $# --pdf web/website.ini --putenv:nimversion=$#" %
[findNim(), args, VersionAsString], additionalPATH=findNim().splitFile.dir) [findNim().quoteShell(), args, VersionAsString], additionalPATH=findNim().splitFile.dir)
# -------------- boot --------------------------------------------------------- # -------------- boot ---------------------------------------------------------
@ -297,7 +297,7 @@ proc boot(args: string) =
let smartNimcache = (if "release" in args or "danger" in args: "nimcache/r_" else: "nimcache/d_") & let smartNimcache = (if "release" in args or "danger" in args: "nimcache/r_" else: "nimcache/d_") &
hostOS & "_" & hostCPU hostOS & "_" & hostCPU
let nimStart = findStartNim() let nimStart = findStartNim().quoteShell()
for i in 0..2: for i in 0..2:
let defaultCommand = if useCpp: "cpp" else: "c" let defaultCommand = if useCpp: "cpp" else: "c"
let bootOptions = if args.len == 0 or args.startsWith("-"): defaultCommand else: "" let bootOptions = if args.len == 0 or args.startsWith("-"): defaultCommand else: ""
@ -455,7 +455,7 @@ proc temp(args: string) =
"threads" notin programArgs and "threads" notin programArgs and
"js" notin programArgs: "js" notin programArgs:
bootArgs.add " -d:leanCompiler" bootArgs.add " -d:leanCompiler"
let nimexec = findNim() let nimexec = findNim().quoteShell()
exec(nimexec & " c -d:debug --debugger:native -d:nimBetterRun " & bootArgs & " " & (d / "compiler" / "nim"), 125) exec(nimexec & " c -d:debug --debugger:native -d:nimBetterRun " & bootArgs & " " & (d / "compiler" / "nim"), 125)
copyExe(output, finalDest) copyExe(output, finalDest)
setCurrentDir(origDir) setCurrentDir(origDir)

16
tools/kochdocs.nim
View file

@ -70,16 +70,16 @@ proc execCleanPath*(cmd: string,
proc nimexec*(cmd: string) = proc nimexec*(cmd: string) =
# Consider using `nimCompile` instead # Consider using `nimCompile` instead
exec findNim() & " " & cmd exec findNim().quoteShell() & " " & cmd
proc nimCompile*(input: string, outputDir = "bin", mode = "c", options = "") = proc nimCompile*(input: string, outputDir = "bin", mode = "c", options = "") =
let output = outputDir / input.splitFile.name.exe let output = outputDir / input.splitFile.name.exe
let cmd = findNim() & " " & mode & " -o:" & output & " " & options & " " & input let cmd = findNim().quoteShell() & " " & mode & " -o:" & output & " " & options & " " & input
exec cmd exec cmd
proc nimCompileFold*(desc, input: string, outputDir = "bin", mode = "c", options = "") = proc nimCompileFold*(desc, input: string, outputDir = "bin", mode = "c", options = "") =
let output = outputDir / input.splitFile.name.exe let output = outputDir / input.splitFile.name.exe
let cmd = findNim() & " " & mode & " -o:" & output & " " & options & " " & input let cmd = findNim().quoteShell() & " " & mode & " -o:" & output & " " & options & " " & input
execFold(desc, cmd) execFold(desc, cmd)
const const
@ -299,7 +299,7 @@ proc buildDocSamples(nimArgs, destPath: string) =
## ##
## TODO: consider integrating into the existing generic documentation builders ## TODO: consider integrating into the existing generic documentation builders
## now that we have a single `doc` command. ## now that we have a single `doc` command.
exec(findNim() & " doc $# -o:$# $#" % exec(findNim().quoteShell() & " doc $# -o:$# $#" %
[nimArgs, destPath / "docgen_sample.html", "doc" / "docgen_sample.nim"]) [nimArgs, destPath / "docgen_sample.html", "doc" / "docgen_sample.nim"])
proc buildDoc(nimArgs, destPath: string) = proc buildDoc(nimArgs, destPath: string) =
@ -307,7 +307,7 @@ proc buildDoc(nimArgs, destPath: string) =
var var
commands = newSeq[string](rst2html.len + len(doc0) + len(doc) + withoutIndex.len) commands = newSeq[string](rst2html.len + len(doc0) + len(doc) + withoutIndex.len)
i = 0 i = 0
let nim = findNim() let nim = findNim().quoteShell()
for d in items(rst2html): for d in items(rst2html):
commands[i] = nim & " rst2html $# --git.url:$# -o:$# --index:on $#" % commands[i] = nim & " rst2html $# --git.url:$# -o:$# --index:on $#" %
[nimArgs, gitUrl, [nimArgs, gitUrl,
@ -339,7 +339,7 @@ proc buildPdfDoc*(nimArgs, destPath: string) =
else: else:
const pdflatexcmd = "pdflatex -interaction=nonstopmode " const pdflatexcmd = "pdflatex -interaction=nonstopmode "
for d in items(pdf): for d in items(pdf):
exec(findNim() & " rst2tex $# $#" % [nimArgs, d]) exec(findNim().quoteShell() & " rst2tex $# $#" % [nimArgs, d])
# call LaTeX twice to get cross references right: # call LaTeX twice to get cross references right:
exec(pdflatexcmd & changeFileExt(d, "tex")) exec(pdflatexcmd & changeFileExt(d, "tex"))
exec(pdflatexcmd & changeFileExt(d, "tex")) exec(pdflatexcmd & changeFileExt(d, "tex"))
@ -356,9 +356,9 @@ proc buildPdfDoc*(nimArgs, destPath: string) =
removeFile(changeFileExt(d, "tex")) removeFile(changeFileExt(d, "tex"))
proc buildJS() = proc buildJS() =
exec(findNim() & " js -d:release --out:$1 tools/nimblepkglist.nim" % exec(findNim().quoteShell() & " js -d:release --out:$1 tools/nimblepkglist.nim" %
[webUploadOutput / "nimblepkglist.js"]) [webUploadOutput / "nimblepkglist.js"])
exec(findNim() & " js " & (docHackDir / "dochack.nim")) exec(findNim().quoteShell() & " js " & (docHackDir / "dochack.nim"))
proc buildDocs*(args: string) = proc buildDocs*(args: string) =
const const