Skip to content

Commit a897407

Browse files
committed
Proper detection of lliurex distribution
1 parent 5590828 commit a897407

1 file changed

Lines changed: 14 additions & 9 deletions

File tree

src/detection/os/os_linux.c

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,20 @@ FF_MAYBE_UNUSED static void getUbuntuFlavour(FFOSResult* result)
8888
ffStrbufSetStatic(&result->id, "vanilla");
8989
ffStrbufSetStatic(&result->idLike, "ubuntu");
9090
}
91+
if (ffPathExists("/etc/lliurex-cdd-version", FF_PATHTYPE_FILE))
92+
{
93+
ffStrbufSetStatic(&result->name, "LliureX");
94+
ffStrbufSetStatic(&result->id, "lliurex");
95+
ffStrbufClear(&result->version);
96+
if (ffProcessAppendStdOut(&result->version, (char* const[]) {
97+
"/usr/bin/lliurex-version",
98+
NULL,
99+
}) == NULL) // 8.2.2
100+
ffStrbufTrimRightSpace(&result->versionID);
101+
ffStrbufSetF(&result->prettyName, "LliureX %s", result->version.chars);
102+
ffStrbufSetStatic(&result->idLike, "ubuntu");
103+
return;
104+
}
91105

92106
if(ffStrContains(xdgConfigDirs, "kde") || ffStrContains(xdgConfigDirs, "plasma") || ffStrContains(xdgConfigDirs, "kubuntu"))
93107
{
@@ -169,15 +183,6 @@ FF_MAYBE_UNUSED static void getUbuntuFlavour(FFOSResult* result)
169183
ffStrbufSetStatic(&result->idLike, "ubuntu");
170184
return;
171185
}
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-
}
181186
}
182187

183188
FF_MAYBE_UNUSED static void getDebianVersion(FFOSResult* result)

0 commit comments

Comments
 (0)