From f4dbdd311fbb3dd99dafca2179f17f2747531b4f Mon Sep 17 00:00:00 2001 From: Hayden Date: Fri, 20 Mar 2020 05:59:05 -0400 Subject: [PATCH] Detect Ubuntu by checking release() and uname() (#13704) This will improve detection of Ubuntu when running on Ubuntu on WSL. #13703 --- lib/pure/distros.nim | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/pure/distros.nim b/lib/pure/distros.nim index 63cfe67198..8d4fbc8575 100644 --- a/lib/pure/distros.nim +++ b/lib/pure/distros.nim @@ -156,7 +156,9 @@ proc detectOsImpl(d: Distribution): bool = of Distribution.Posix: result = defined(posix) of Distribution.MacOSX: result = defined(macosx) of Distribution.Linux: result = defined(linux) - of Distribution.Ubuntu, Distribution.Gentoo, Distribution.FreeBSD, + of Distribution.Ubuntu: + result = "Ubuntu" in release() or ("-" & $d & " ") in uname() + of Distribution.Gentoo, Distribution.FreeBSD, Distribution.OpenBSD: result = ("-" & $d & " ") in uname() of Distribution.RedHat: