Skip to content
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

Refactor Armbian version detection and add support for ubuntu-based armbian detection #1447

Merged
merged 4 commits into from
Dec 19, 2024
Merged

Refactor Armbian version detection and add support for ubuntu-based armbian detection #1447

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
892d42f
Add support for detection of Armbian as Ubuntu flavor
JohnTheCoolingFan Dec 18, 2024
9130da6
Refactor Armbian detection
JohnTheCoolingFan Dec 18, 2024
a623b59
Armbian: set idLike to id before setting id to "armbian"
JohnTheCoolingFan Dec 19, 2024
fc1af76
Tidy up detectArmbianVersion
JohnTheCoolingFan Dec 19, 2024
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
58 changes: 36 additions & 22 deletions src/detection/os/os_linux.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,47 @@ static bool parseOsRelease(const char* fileName, FFOSResult* result)
});
}

// Get Armbian version properties and set idLike based on the Armbian image basis
FF_MAYBE_UNUSED static void getArmbianVersion(FFOSResult* result)
{
if(ffStrbufIgnCaseEqualS(&result->id, "ubuntu"))
ffStrbufSetS(&result->idLike, "ubuntu");
else if(ffStrbufIgnCaseEqualS(&result->id, "debian"))
ffStrbufSetS(&result->idLike, "debian");
ffStrbufSetS(&result->id, "armbian");
ffStrbufClear(&result->versionID);
uint32_t versionStart = ffStrbufFirstIndexC(&result->prettyName, ' ') + 1;
uint32_t versionEnd = ffStrbufNextIndexC(&result->prettyName, versionStart, ' ');
ffStrbufSetNS(&result->versionID, versionEnd - versionStart, result->prettyName.chars + versionStart);
}

// Common logic for detecting Armbian image version
FF_MAYBE_UNUSED static bool detectArmbianVersion(FFOSResult* result)
{
if (ffStrbufStartsWithS(&result->prettyName, "Armbian ")) // Official Armbian release images
{
ffStrbufSetS(&result->name, "Armbian");
getArmbianVersion(result);
return true;
}
else if (ffStrbufStartsWithS(&result->prettyName, "Armbian-unofficial ")) // Unofficial Armbian image built from source
{
ffStrbufSetS(&result->name, "Armbian (custom build)");
getArmbianVersion(result);
return true;
}
return false;
}

FF_MAYBE_UNUSED static void getUbuntuFlavour(FFOSResult* result)
{
const char* xdgConfigDirs = getenv("XDG_CONFIG_DIRS");
if(!ffStrSet(xdgConfigDirs))
return;

if(ffStrbufStartsWithS(&result->prettyName, "Linux Lite "))
if (detectArmbianVersion(result))
return;
else if(ffStrbufStartsWithS(&result->prettyName, "Linux Lite "))
{
ffStrbufSetS(&result->name, "Linux Lite");
ffStrbufSetS(&result->id, "linuxlite");
Expand Down Expand Up @@ -164,28 +198,8 @@ FF_MAYBE_UNUSED static void getDebianVersion(FFOSResult* result)

FF_MAYBE_UNUSED static bool detectDebianDerived(FFOSResult* result)
{
if (ffStrbufStartsWithS(&result->prettyName, "Armbian ")) // Armbian 24.2.1 bookworm
{
ffStrbufSetS(&result->name, "Armbian");
ffStrbufSetS(&result->id, "armbian");
ffStrbufSetS(&result->idLike, "debian");
ffStrbufClear(&result->versionID);
uint32_t versionStart = ffStrbufFirstIndexC(&result->prettyName, ' ') + 1;
uint32_t versionEnd = ffStrbufNextIndexC(&result->prettyName, versionStart, ' ');
ffStrbufSetNS(&result->versionID, versionEnd - versionStart, result->prettyName.chars + versionStart);
if (detectArmbianVersion(result))
return true;
}
else if (ffStrbufStartsWithS(&result->prettyName, "Armbian-unofficial ")) // Unofficial Armbian image built from source
{
ffStrbufSetS(&result->name, "Armbian (custom build)");
ffStrbufSetS(&result->id, "armbian");
ffStrbufSetS(&result->idLike, "debian");
ffStrbufClear(&result->versionID);
uint32_t versionStart = ffStrbufFirstIndexC(&result->prettyName, ' ') + 1;
uint32_t versionEnd = ffStrbufNextIndexC(&result->prettyName, versionStart, ' ');
ffStrbufSetNS(&result->versionID, versionEnd - versionStart, result->prettyName.chars + versionStart);
return true;
}
else if (ffStrbufStartsWithS(&result->name, "Loc-OS"))
{
ffStrbufSetS(&result->id, "locos");
Expand Down
Loading