Skip to content

Fix lliurex detection #1882

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
merged 5 commits into from
Aug 11, 2025
Merged

Fix lliurex detection #1882

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a897407
Proper detection of lliurex distribution
juanma1980 Aug 3, 2025
5c02a26
fix newline
juanma1980 Aug 3, 2025
83b69a4
Merge branch 'fastfetch-cli:dev' into dev
juanma1980 Aug 4, 2025
5aa55e6
Trim version and not versionID as assigned to lliurex-version output
juanma1980 Aug 4, 2025
fa58816
Update os_linux.c
CarterLi Aug 11, 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
24 changes: 15 additions & 9 deletions src/detection/os/os_linux.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,21 @@ FF_MAYBE_UNUSED static void getUbuntuFlavour(FFOSResult* result)
ffStrbufSetStatic(&result->idLike, "ubuntu");
}

if (ffPathExists("/etc/lliurex-cdd-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->versionID);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You appended the version string to &result->version, but triming &result->versionID here?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And you put executable binaries to /etc/? Shouldn't it be a regular text file?

Copy link
Contributor Author

@juanma1980 juanma1980 Aug 4, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi, the trim was left by mistake.
For the another question there's no binary at /etc. The check for /etc/lliurex-cdd-version is for a regular txt file, the binary to get the lliurex version is at /usr/bin/lliurex-version. First checks for the file, then (if file exists) gets the version through a binary. I could check the binary itself directly but it will fail if the aforementioned file didn't exist so I believe is better to check for the file.

p.s. I've made another commit fixing the trim

ffStrbufSetF(&result->prettyName, "LliureX %s", result->version.chars);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What if ffProcessAppendStdOut failed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lliurex-version is a basic system command in lliurex, if it fails then something is really wrong, it wold be as if command lsb_release fails. If you want I can add any behaviour on fail but the tests I did seemed to be ok without any issue at all.

Cheers

ffStrbufSetStatic(&result->idLike, "ubuntu");
return;
}

if(ffStrContains(xdgConfigDirs, "kde") || ffStrContains(xdgConfigDirs, "plasma") || ffStrContains(xdgConfigDirs, "kubuntu"))
{
ffStrbufSetStatic(&result->name, "Kubuntu");
Expand Down Expand Up @@ -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)
Expand Down
Loading