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

Add call to hostnamectl in detectOsImpl (#10048)

Browse source
This commit is contained in:
Taylor Hoff 2018-12-20 02:45:43 -05:00 • committed by Andreas Rumpf
commit 68ec42cec7
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/pure/distros.nim
View file

@ -133,7 +133,7 @@ const
LacksDevPackages* = {Distribution.Gentoo, Distribution.Slackware, LacksDevPackages* = {Distribution.Gentoo, Distribution.Slackware,
Distribution.ArchLinux} Distribution.ArchLinux}
var unameRes, releaseRes: string ## we cache the result of the 'uname -a' var unameRes, releaseRes, hostnamectlRes: string ## we cache the result of the 'uname -a'
## execution for faster platform detections. ## execution for faster platform detections.
template unameRelease(cmd, cache): untyped = template unameRelease(cmd, cache): untyped =
@ -143,6 +143,7 @@ template unameRelease(cmd, cache): untyped =
template uname(): untyped = unameRelease("uname -a", unameRes) template uname(): untyped = unameRelease("uname -a", unameRes)
template release(): untyped = unameRelease("lsb_release -a", releaseRes) template release(): untyped = unameRelease("lsb_release -a", releaseRes)
template hostnamectl(): untyped = unameRelease("hostnamectl", hostnamectlRes)
proc detectOsImpl(d: Distribution): bool = proc detectOsImpl(d: Distribution): bool =
case d case d
@ -172,7 +173,7 @@ proc detectOsImpl(d: Distribution): bool =
result = defined(haiku) result = defined(haiku)
else: else:
let dd = toLowerAscii($d) let dd = toLowerAscii($d)
result = dd in toLowerAscii(uname()) or dd in toLowerAscii(release()) result = dd in toLowerAscii(uname()) or dd in toLowerAscii(release()) or dd in toLowerAscii(hostnamectl())
template detectOs*(d: untyped): bool = template detectOs*(d: untyped): bool =
## Distro/OS detection. For convenience the ## Distro/OS detection. For convenience the