OS (Linux): Better Ubuntu flavor detection

osalbahr · CarterLi · commit 2ae9d012006a · 2025-09-22T10:04:45.000+08:00
- Fixes #1974
diff --git a/src/detection/os/os_linux.c b/src/detection/os/os_linux.c
@@ -61,10 +61,6 @@ FF_MAYBE_UNUSED static bool detectArmbianVersion(FFOSResult* result)
 
 FF_MAYBE_UNUSED static void getUbuntuFlavour(FFOSResult* result)
 {
-    const char* xdgConfigDirs = getenv("XDG_CONFIG_DIRS");
-    if(!ffStrSet(xdgConfigDirs))
-        return;
-
     if (detectArmbianVersion(result))
         return;
     else if(ffStrbufStartsWithS(&result->prettyName, "Linux Lite "))
@@ -104,6 +100,10 @@ FF_MAYBE_UNUSED static void getUbuntuFlavour(FFOSResult* result)
         return;
     }
 
+    const char* xdgConfigDirs = getenv("XDG_CONFIG_DIRS");
+    if(!ffStrSet(xdgConfigDirs))
+        return;
+
     if(ffStrContains(xdgConfigDirs, "kde") || ffStrContains(xdgConfigDirs, "plasma") || ffStrContains(xdgConfigDirs, "kubuntu"))
     {
         ffStrbufSetStatic(&result->name, "Kubuntu");

Original file line number	Diff line number	Diff line change
`@@ -61,10 +61,6 @@ FF_MAYBE_UNUSED static bool detectArmbianVersion(FFOSResult* result)`
`61`	`61`
`62`	`62`	`FF_MAYBE_UNUSED static void getUbuntuFlavour(FFOSResult* result)`
`63`	`63`	`{`
`64`		`- const char* xdgConfigDirs = getenv("XDG_CONFIG_DIRS");`
`65`		`- if(!ffStrSet(xdgConfigDirs))`
`66`		`- return;`
`67`		`-`
`68`	`64`	`if (detectArmbianVersion(result))`
`69`	`65`	`return;`
`70`	`66`	`else if(ffStrbufStartsWithS(&result->prettyName, "Linux Lite "))`
`@@ -104,6 +100,10 @@ FF_MAYBE_UNUSED static void getUbuntuFlavour(FFOSResult* result)`
`104`	`100`	`return;`
`105`	`101`	`}`
`106`	`102`
	`103`	`+ const char* xdgConfigDirs = getenv("XDG_CONFIG_DIRS");`
	`104`	`+ if(!ffStrSet(xdgConfigDirs))`
	`105`	`+ return;`
	`106`	`+`
`107`	`107`	`if(ffStrContains(xdgConfigDirs, "kde") \|\| ffStrContains(xdgConfigDirs, "plasma") \|\| ffStrContains(xdgConfigDirs, "kubuntu"))`
`108`	`108`	`{`
`109`	`109`	`ffStrbufSetStatic(&result->name, "Kubuntu");`