fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-10-30 00:37:23 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

OS (Linux): actually display debian .x version

Browse Source 
Also display code name on Linux
This commit is contained in:
李通洲
2023-09-28 23:40:03 +08:00
parent 289976372f
commit 9857f48bb9
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/detection/os/os_linux.c
+3 -2
View File
@@ -126,8 +126,9 @@ static void getDebianVersion(FFOSResult* result)
{
FF_STRBUF_AUTO_DESTROY debianVersion = ffStrbufCreate();
ffAppendFileBuffer("/etc/debian_version", &debianVersion);
if (debianVersion.length)
ffStrbufSet(&result->version, &debianVersion);
if (!debianVersion.length) return;
ffStrbufSet(&result->version, &debianVersion);
ffStrbufSet(&result->versionID, &debianVersion);
}
static void detectOS(FFOSResult* os)
src/modules/os/os.c
+4 -5
View File
@@ -21,21 +21,20 @@ static void buildOutputDefault(const FFOSResult* os, FFstrbuf* result)
else
ffStrbufAppend(result, &instance.state.platform.systemName);
#ifdef __APPLE__
if(os->codename.length > 0)
//Append code name if it is missing
if(os->codename.length > 0 && !ffStrbufContain(result, &os->versionID))
{
ffStrbufAppendC(result, ' ');
ffStrbufAppend(result, &os->codename);
}
#endif
//Append version if it is missing
if(os->versionID.length > 0 && ffStrbufFirstIndex(result, &os->versionID) == result->length)
if(os->versionID.length > 0 && !ffStrbufContain(result, &os->versionID))
{
ffStrbufAppendC(result, ' ');
ffStrbufAppend(result, &os->versionID);
}
else if(os->versionID.length == 0 && os->version.length > 0 && ffStrbufFirstIndex(result, &os->version) == result->length)
else if(os->versionID.length == 0 && os->version.length > 0 && !ffStrbufContain(result, &os->version))
{
ffStrbufAppendC(result, ' ');
ffStrbufAppend(result, &os->version);