Skip to content

linux: Fix checkLinuxSystemInfo for Win/Mac #194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RytoEX merged 2 commits into from
Oct 29, 2025
Merged

linux: Fix checkLinuxSystemInfo for Win/Mac #194

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92547fd
linux: Fix `checkLinuxSystemInfo` for Win/Mac
mihawk90 Oct 29, 2025
a713de1
linux: Log missing `/etc/os-release` file
mihawk90 Oct 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions checks/linux.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,14 @@ def checkDistro(lines):
distro = isDistroNix[0].split()
distro = distro[2:]
distro = ' '.join(distro)
distroHelp = ''

return [LEVEL_INFO, distro, ""]
# this is logged when the file can't be found at all
if distro == 'Missing /etc/os-release !':
distro = '(Missing)'
distroHelp = 'No distribution detected. This can lead to undefined behavior. Please consult your distribution\'s support channels on how to fix this.<br>'

return [LEVEL_INFO, distro, distroHelp]


def checkFlatpak(lines):
Expand Down Expand Up @@ -178,16 +184,14 @@ def checkLinuxVCam(lines):


def checkLinuxSystemInfo(lines):
if checkFlatpak(lines):
if flatpak := checkFlatpak(lines):
linuxDistroOrFlatpak = 'Flatpak'
linuxSystemInfoHelp = checkFlatpak(lines)[2] + '<br>'
elif checkDistro(lines):
linuxDistroOrFlatpak = 'Distribution: ' + checkDistro(lines)[1]
linuxSystemInfoHelp = ''
linuxSystemInfoHelp = flatpak[2] + '<br>'
elif distro := checkDistro(lines):
linuxDistroOrFlatpak = 'Distribution: ' + distro[1]
linuxSystemInfoHelp = distro[2]
else:
# I have never seen this, but you never know
linuxDistroOrFlatpak = 'Distribution: ⚠️ None'
linuxSystemInfoHelp = 'No distribution detected. This can lead to undefined behaviour. Please consult your distribution\'s support channels on how to fix this.<br>'
return

if isX11(lines):
displayServer = 'X11'
Expand All @@ -196,13 +200,13 @@ def checkLinuxSystemInfo(lines):
else:
# can happen with misconfigured or virtual systems
displayServer = '⚠️ None'
linuxSystemInfoHelp += 'No Display Server detected. This can lead to undefined behaviour. Please consult your Desktop Environment\'s or Window Manager\'s support channels on how to fix this.<br>'
linuxSystemInfoHelp += 'No Display Server detected. This can lead to undefined behavior. Please consult your Desktop Environment\'s or Window Manager\'s support channels on how to fix this.<br>'

if checkDesktopEnvironment(lines):
desktopEnvironment = 'DE: ' + checkDesktopEnvironment(lines)[1]
else:
# can happen for some misconfigured tiling window managers
desktopEnvironment = 'DE: ⚠️ None'
linuxSystemInfoHelp += 'No Desktop Environment detected. This can lead to undefined behaviour. Please consult your Desktop Environment\'s or Window Manager\'s support channels on how to fix this.'
linuxSystemInfoHelp += 'No Desktop Environment detected. This can lead to undefined behavior. Please consult your Desktop Environment\'s or Window Manager\'s support channels on how to fix this.'

return [LEVEL_INFO, linuxDistroOrFlatpak + ' | ' + displayServer + ' | ' + desktopEnvironment, linuxSystemInfoHelp]