@@ -46,33 +46,22 @@ static bool parseOsRelease(const char* fileName, FFOSResult* result)
4646 });
4747}
4848
49- // Get Armbian version properties and set idLike based on the Armbian image basis
50- FF_MAYBE_UNUSED static void getArmbianVersion (FFOSResult * result )
51- {
52- ffStrbufSet (& result -> idLike , & result -> id );
53- ffStrbufSetS (& result -> id , "armbian" );
54- ffStrbufClear (& result -> versionID );
55- uint32_t versionStart = ffStrbufFirstIndexC (& result -> prettyName , ' ' ) + 1 ;
56- uint32_t versionEnd = ffStrbufNextIndexC (& result -> prettyName , versionStart , ' ' );
57- ffStrbufSetNS (& result -> versionID , versionEnd - versionStart , result -> prettyName .chars + versionStart );
58- }
59-
6049// Common logic for detecting Armbian image version
6150FF_MAYBE_UNUSED static bool detectArmbianVersion (FFOSResult * result )
6251{
6352 if (ffStrbufStartsWithS (& result -> prettyName , "Armbian " )) // Official Armbian release images
64- {
6553 ffStrbufSetS (& result -> name , "Armbian" );
66- getArmbianVersion (result );
67- return true;
68- }
6954 else if (ffStrbufStartsWithS (& result -> prettyName , "Armbian-unofficial " )) // Unofficial Armbian image built from source
70- {
7155 ffStrbufSetS (& result -> name , "Armbian (custom build)" );
72- getArmbianVersion (result );
73- return true;
74- }
75- return false;
56+ else
57+ return false;
58+ ffStrbufSet (& result -> idLike , & result -> id );
59+ ffStrbufSetS (& result -> id , "armbian" );
60+ ffStrbufClear (& result -> versionID );
61+ uint32_t versionStart = ffStrbufFirstIndexC (& result -> prettyName , ' ' ) + 1 ;
62+ uint32_t versionEnd = ffStrbufNextIndexC (& result -> prettyName , versionStart , ' ' );
63+ ffStrbufSetNS (& result -> versionID , versionEnd - versionStart , result -> prettyName .chars + versionStart );
64+ return true;
7665}
7766
7867FF_MAYBE_UNUSED static void getUbuntuFlavour (FFOSResult * result )
0 commit comments