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

CMake: add option CUSTOM_OS_RELEASE_PATH

Browse Source 
And remove `--os-file`
This commit is contained in:
Carter Li
2024-05-06 16:25:08 +08:00
parent dc9c285a0b
commit 3e24cdc752
5 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/detection/os/os_linux.c
+8 -6
View File
@@ -7,6 +7,9 @@
#include <string.h>
#include <stdlib.h>
#define FF_STR_INDIR(x) #x
#define FF_STR(x) FF_STR_INDIR(x)
static inline bool allRelevantValuesSet(const FFOSResult* result)
{
return result->id.length > 0
@@ -141,12 +144,11 @@ static void getDebianVersion(FFOSResult* result)
static void detectOS(FFOSResult* os)
{
if(instance.config.general.osFile.length > 0)
{
parseLsbRelease(instance.config.general.osFile.chars, os);
parseOsRelease(instance.config.general.osFile.chars, os);
return;
}
#ifdef FF_CUSTOM_OS_RELEASE_PATH
parseOsRelease(FF_STR(FF_CUSTOM_OS_RELEASE_PATH), os);
parseLsbRelease(FF_STR(FF_CUSTOM_OS_RELEASE_PATH), os);
return;
#endif
if(instance.config.general.escapeBedrock && parseOsRelease(FASTFETCH_TARGET_DIR_ROOT "/bedrock" FASTFETCH_TARGET_DIR_ETC "/bedrock-release", os))
{