Skip to content

Commit eee98e5

Browse files
juanma1980CarterLi
andauthored
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 <[email protected]>
1 parent b0340d5 commit eee98e5

File tree

1 file changed

+15
-9
lines changed

1 file changed

+15
-9
lines changed

src/detection/os/os_linux.c

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,21 @@ FF_MAYBE_UNUSED static void getUbuntuFlavour(FFOSResult* result)
8989
ffStrbufSetStatic(&result->idLike, "ubuntu");
9090
}
9191

92+
if (ffPathExists("/usr/bin/lliurex-version", FF_PATHTYPE_FILE))
93+
{
94+
ffStrbufSetStatic(&result->name, "LliureX");
95+
ffStrbufSetStatic(&result->id, "lliurex");
96+
ffStrbufClear(&result->version);
97+
if (ffProcessAppendStdOut(&result->version, (char* const[]) {
98+
"/usr/bin/lliurex-version",
99+
NULL,
100+
}) == NULL) // 8.2.2
101+
ffStrbufTrimRightSpace(&result->version);
102+
ffStrbufSetF(&result->prettyName, "LliureX %s", result->version.chars);
103+
ffStrbufSetStatic(&result->idLike, "ubuntu");
104+
return;
105+
}
106+
92107
if(ffStrContains(xdgConfigDirs, "kde") || ffStrContains(xdgConfigDirs, "plasma") || ffStrContains(xdgConfigDirs, "kubuntu"))
93108
{
94109
ffStrbufSetStatic(&result->name, "Kubuntu");
@@ -169,15 +184,6 @@ FF_MAYBE_UNUSED static void getUbuntuFlavour(FFOSResult* result)
169184
ffStrbufSetStatic(&result->idLike, "ubuntu");
170185
return;
171186
}
172-
173-
if(ffStrContains(xdgConfigDirs, "lliurex"))
174-
{
175-
ffStrbufSetStatic(&result->name, "LliureX");
176-
ffStrbufSetF(&result->prettyName, "LliureX %s", result->version.chars);
177-
ffStrbufSetStatic(&result->id, "lliurex");
178-
ffStrbufSetStatic(&result->idLike, "ubuntu");
179-
return;
180-
}
181187
}
182188

183189
FF_MAYBE_UNUSED static void getDebianVersion(FFOSResult* result)

0 commit comments

Comments
 (0)