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

Stop false positives in distros.detectOs (#10062)

Browse source 
* Stop false positives in distros.nim

* Fix bad string comparison on line 176 of distros.nim
This commit is contained in:
Taylor Hoff 2018-12-21 16:52:57 -05:00 • committed by Andreas Rumpf
commit 8869aa74db
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/pure/distros.nim
View file

@ -141,8 +141,8 @@ template unameRelease(cmd, cache): untyped =
cache = (when defined(nimscript): gorge(cmd) else: execProcess(cmd))
cache
template uname(): untyped = unameRelease("uname -a", unameRes)
template release(): untyped = unameRelease("lsb_release -a", releaseRes)
template uname(): untyped = unameRelease("uname -o", unameRes)
template release(): untyped = unameRelease("lsb_release -d", releaseRes)
template hostnamectl(): untyped = unameRelease("hostnamectl", hostnamectlRes)
proc detectOsImpl(d: Distribution): bool =
@ -173,7 +173,7 @@ proc detectOsImpl(d: Distribution): bool =
result = defined(haiku)
else:
let dd = toLowerAscii($d)
result = dd in toLowerAscii(uname()) or dd in toLowerAscii(release()) or dd in toLowerAscii(hostnamectl())
result = dd in toLowerAscii(uname()) or dd in toLowerAscii(release()) or ("operating system: " & dd) in toLowerAscii(hostnamectl())
template detectOs*(d: untyped): bool =
## Distro/OS detection. For convenience the