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

OS: make osFile a global option

Browse Source 
`OS` is used by Module `Package`
This commit is contained in:
李通洲
2023-06-12 15:42:26 +08:00
parent d7115022e4
commit e9b3a799bc
7 changed files with 13 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/init.c
+4 -2
View File
@@ -36,9 +36,10 @@ static void defaultConfig(FFinstance* instance)
ffStrbufInit(&instance->config.colorKeys);
ffStrbufInit(&instance->config.colorTitle);
ffStrbufInitS(&instance->config.keyValueSeparator, ": ");
#if defined(__linux__) || defined(__FreeBSD__)
ffStrbufInit(&instance->config.playerName);
ffStrbufInit(&instance->config.osFile);
#endif
instance->config.showErrors = false;
@@ -254,9 +255,10 @@ static void destroyConfig(FFinstance* instance)
ffStrbufDestroy(&instance->config.colorKeys);
ffStrbufDestroy(&instance->config.colorTitle);
ffStrbufDestroy(&instance->config.keyValueSeparator);
#if defined(__linux__) || defined(__FreeBSD__)
ffStrbufDestroy(&instance->config.playerName);
ffStrbufDestroy(&instance->config.osFile);
#endif
ffDestroyTitleOptions(&instance->config.title);
src/common/jsonconfig.c
+3 -1
View File
@@ -304,10 +304,12 @@ const char* ffParseGeneralJsonConfig(FFinstance* instance)
config->escapeBedrock = yyjson_get_bool(val);
else if (strcasecmp(key, "pipe") == 0)
config->pipe = yyjson_get_bool(val);
#if defined(__linux__) || defined(__FreeBSD__)
else if (strcasecmp(key, "playerName") == 0)
ffStrbufSetS(&config->playerName, yyjson_get_str(val));
else if (strcasecmp(key, "osFile") == 0)
ffStrbufSetS(&config->osFile, yyjson_get_str(val));
#endif
else