No need for defining my own join, used addFileExt instead of &
This commit is contained in:
parent
819d175ffe
commit
e606ad8d3f
1 changed files with 3 additions and 10 deletions
|
|
@ -20,13 +20,6 @@ proc getNimVersion(cmd: string = "nimrod"): String =
|
||||||
|
|
||||||
return "0.8.10"
|
return "0.8.10"
|
||||||
|
|
||||||
proc join(s: seq[string], sep: char = ' '): string =
|
|
||||||
result = ""
|
|
||||||
for i in 0..len(s)-1:
|
|
||||||
if i < len(s)-1:
|
|
||||||
result.add($sep)
|
|
||||||
result.add(s[i])
|
|
||||||
|
|
||||||
proc dependExists(name: string, verRange: PVersionRange): Bool =
|
proc dependExists(name: string, verRange: PVersionRange): Bool =
|
||||||
if name == "nimrod":
|
if name == "nimrod":
|
||||||
var nimVer = getNimVersion()
|
var nimVer = getNimVersion()
|
||||||
|
|
@ -51,7 +44,7 @@ proc verifyDepends*(proj: TProject): seq[TDepend] =
|
||||||
elif spl.len > 1:
|
elif spl.len > 1:
|
||||||
nameStr = spl[0]
|
nameStr = spl[0]
|
||||||
spl.del(0)
|
spl.del(0)
|
||||||
verStr = join(spl, ' ')
|
verStr = join(spl, " ")
|
||||||
else:
|
else:
|
||||||
raise newException(EInstall, "Incorrect dependency got: " & i)
|
raise newException(EInstall, "Incorrect dependency got: " & i)
|
||||||
|
|
||||||
|
|
@ -73,9 +66,9 @@ proc install*(name: string, filename: string = "") =
|
||||||
var babelFile: TProject = initProj()
|
var babelFile: TProject = initProj()
|
||||||
var path = ""
|
var path = ""
|
||||||
if filename == "":
|
if filename == "":
|
||||||
path = name & ".babel"
|
path = name.addFileExt("babel")
|
||||||
else:
|
else:
|
||||||
path = filename / name & ".babel"
|
path = filename / name.addFileExt("babel")
|
||||||
|
|
||||||
echo("Reading ", path, "...")
|
echo("Reading ", path, "...")
|
||||||
babelFile = parseBabel(path)
|
babelFile = parseBabel(path)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue