OS (Linux): fix lliurex detection (#1882)

* Proper detection of lliurex distribution

* fix newline

* Trim version and not versionID as assigned to lliurex-version  output

* Update os_linux.c

---------

Co-authored-by: Carter Li <CarterLi@users.noreply.github.com>
This commit is contained in:
Juanma
2025-08-11 03:45:53 +02:00
committed by GitHub
parent b0340d5581
commit eee98e54d0
+15 -9
View File
@@ -89,6 +89,21 @@ FF_MAYBE_UNUSED static void getUbuntuFlavour(FFOSResult* result)
ffStrbufSetStatic(&result->idLike, "ubuntu");
}
if (ffPathExists("/usr/bin/lliurex-version", FF_PATHTYPE_FILE))
{
ffStrbufSetStatic(&result->name, "LliureX");
ffStrbufSetStatic(&result->id, "lliurex");
ffStrbufClear(&result->version);
if (ffProcessAppendStdOut(&result->version, (char* const[]) {
"/usr/bin/lliurex-version",
NULL,
}) == NULL) // 8.2.2
ffStrbufTrimRightSpace(&result->version);
ffStrbufSetF(&result->prettyName, "LliureX %s", result->version.chars);
ffStrbufSetStatic(&result->idLike, "ubuntu");
return;
}
if(ffStrContains(xdgConfigDirs, "kde") || ffStrContains(xdgConfigDirs, "plasma") || ffStrContains(xdgConfigDirs, "kubuntu"))
{
ffStrbufSetStatic(&result->name, "Kubuntu");
@@ -169,15 +184,6 @@ FF_MAYBE_UNUSED static void getUbuntuFlavour(FFOSResult* result)
ffStrbufSetStatic(&result->idLike, "ubuntu");
return;
}
if(ffStrContains(xdgConfigDirs, "lliurex"))
{
ffStrbufSetStatic(&result->name, "LliureX");
ffStrbufSetF(&result->prettyName, "LliureX %s", result->version.chars);
ffStrbufSetStatic(&result->id, "lliurex");
ffStrbufSetStatic(&result->idLike, "ubuntu");
return;
}
}
FF_MAYBE_UNUSED static void getDebianVersion(FFOSResult* result)