epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Include Linux DE in OS sysinfo string.

Browse Source
This commit is contained in:
Paul Chote
2023-06-12 17:21:33 +01:00
committed by Gustas
parent 433d69af7a
commit 7f37454666
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
OpenRA.Game/Platform.cs
View File

@@ -85,11 +85,18 @@ namespace OpenRA
{ {
if (CurrentPlatform == PlatformType.Linux) if (CurrentPlatform == PlatformType.Linux)
{ {
var desktopType = Environment.GetEnvironmentVariable("XDG_CURRENT_DESKTOP");
var sessionType = Environment.GetEnvironmentVariable("XDG_SESSION_TYPE"); var sessionType = Environment.GetEnvironmentVariable("XDG_SESSION_TYPE");
if (!string.IsNullOrEmpty(sessionType))
sessionType = $" ({sessionType})"; string suffix;
if (!string.IsNullOrEmpty(desktopType) && !string.IsNullOrEmpty(sessionType))
suffix = $" ({desktopType};{sessionType})";
else if (!string.IsNullOrEmpty(desktopType))
suffix = $" ({desktopType})";
else if (!string.IsNullOrEmpty(sessionType))
suffix = $" ({sessionType})";
else else
sessionType = ""; suffix = "";
try try
{ {
@@ -103,14 +110,14 @@ namespace OpenRA
string line; string line;
while ((line = p.StandardOutput.ReadLine()) != null) while ((line = p.StandardOutput.ReadLine()) != null)
if (line.StartsWith("Operating System: ")) if (line.StartsWith("Operating System: "))
return line[18..] + sessionType; return line[18..] + suffix;
} }
catch { } catch { }
if (File.Exists("/etc/os-release")) if (File.Exists("/etc/os-release"))
foreach (var line in File.ReadLines("/etc/os-release")) foreach (var line in File.ReadLines("/etc/os-release"))
if (line.StartsWith("PRETTY_NAME=")) if (line.StartsWith("PRETTY_NAME="))
return line[13..^1] + sessionType; return line[13..^1] + suffix;
} }
else if (CurrentPlatform == PlatformType.OSX) else if (CurrentPlatform == PlatformType.OSX)
{ {