Skip to content

linux: enhance Deepin version detection using /etc/os-version #2300

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
CarterLi merged 5 commits into from
May 6, 2026
+32 −2
Merged

linux: enhance Deepin version detection using /etc/os-version #2300

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
742c781
feat(os): enhance Deepin detection with os-version data
Iamliuxiaozhen May 3, 2026
1808256
fix(os): use distro name when formatting Deepin prettyName
Iamliuxiaozhen May 3, 2026
8c16cf9
fix(os/linux): guard Deepin minor version override
Iamliuxiaozhen May 3, 2026
15dde48
Refactor Deepin enhancement detection logic
CarterLi May 4, 2026
bbf5c31
Refactor detectDeepinEnhancement function
CarterLi May 4, 2026
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
34 changes: 32 additions & 2 deletions src/detection/os/os_linux.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,7 @@ FF_A_UNUSED static bool getUbuntuFlavour(FFOSResult* result) {
}

// xdgConfigDirs contains plasma only
if (ffPathExists("/var/lib/dpkg/info/ubuntustudio-desktop.list", FF_PATHTYPE_FILE))
{
if (ffPathExists("/var/lib/dpkg/info/ubuntustudio-desktop.list", FF_PATHTYPE_FILE)) {
ffStrbufSetStatic(&result->name, "Ubuntu Studio");
ffStrbufSetStatic(&result->id, "ubuntu-studio");
ffStrbufSetStatic(&result->idLike, "ubuntu");
Expand Down Expand Up @@ -306,6 +305,34 @@ static bool detectBedrock(FFOSResult* os) {
return parseOsRelease(FASTFETCH_TARGET_DIR_ROOT "/bedrock/strata/bedrock/etc/os-release", os);
}

static void detectDeepinEnhancement(FFOSResult* result) {
if (ffStrbufContainC(&result->prettyName, '(')) {
return;
}

FF_STRBUF_AUTO_DESTROY minor = ffStrbufCreate();
FF_STRBUF_AUTO_DESTROY edition = ffStrbufCreate();

if (!ffParsePropFileValues(
FASTFETCH_TARGET_DIR_ETC "/os-version",
2,
(FFpropquery[]) {
{ "MinorVersion=", &minor },
{ "EditionName=", &edition },
}) ||
minor.length == 0) {
return;
}

ffStrbufSet(&result->versionID, &minor);

if (edition.length > 0) {
ffStrbufSetF(&result->prettyName, "%s %s (%s)", result->name.chars, minor.chars, edition.chars);
} else {
ffStrbufSetF(&result->prettyName, "%s %s", result->name.chars, minor.chars);
}
}

static void detectOS(FFOSResult* os) {
#ifdef FF_CUSTOM_OS_RELEASE_PATH
parseOsRelease(FF_STR(FF_CUSTOM_OS_RELEASE_PATH), os);
Expand All @@ -322,6 +349,7 @@ static void detectOS(FFOSResult* os) {
// Refer: https://gist.github.com/natefoo/814c5bf936922dad97ff

parseOsRelease(FASTFETCH_TARGET_DIR_ETC "/os-release", os);

if (os->id.length == 0 || os->version.length == 0 || os->prettyName.length == 0 || os->codename.length == 0) {
parseLsbRelease(FASTFETCH_TARGET_DIR_ETC "/lsb-release", os);
}
Expand Down Expand Up @@ -360,6 +388,8 @@ void ffDetectOSImpl(FFOSResult* os) {
ffStrbufSetS(&os->id, "lmde");
ffStrbufSetS(&os->idLike, "linuxmint");
}
} else if (ffStrbufEqualS(&os->id, "deepin")) {
detectDeepinEnhancement(os);
}
#endif
}
Loading