fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-09-12 10:22:12 +02:00
Code Issues Packages Projects Releases 10 Wiki Activity

Use configDirs to look for fastfetch configs

Browse Source
This commit is contained in:
Linus Dierheimer
2023-01-07 22:51:47 +01:00
parent 137039f868
commit bb57714ac9
2 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/init.c
+7 -1
View File
@@ -101,7 +101,7 @@ static void initConfigDirs(FFstate* state)
#endif
#if !(defined(_WIN32) || defined(__APPLE__) || defined(__ANDROID__))
#if !defined(_WIN32) && !defined(__APPLE__)
FFstrbuf xdgConfigDirs;
ffStrbufInitA(&xdgConfigDirs, 64);
@@ -143,6 +143,12 @@ static void initConfigDirs(FFstate* state)
ffStrbufAppendS(systemConfig, FASTFETCH_TARGET_DIR_ETC"/");
FF_ENSURE_ONLY_ONCE_IN_LIST(systemConfig)
FFstrbuf* systemConfigInstall = ffListAdd(&state->configDirs);
ffStrbufInitA(systemConfigInstall, 64);
ffStrbufAppendS(systemConfigInstall, FASTFETCH_TARGET_DIR_INSTALL_SYSCONF"/");
FF_ENSURE_ONLY_ONCE_IN_LIST(systemConfigInstall)
#endif
#undef FF_ENSURE_ONLY_ONCE_IN_LIST
src/fastfetch.c
+10 -22
View File
@@ -1305,27 +1305,19 @@ error:
}
}
FF_UNUSED_PARAM static void parseConfigFileSystem(FFinstance* instance, FFdata* data)
static void parseConfigFiles(FFinstance* instance, FFdata* data)
{
parseConfigFile(instance, data, FASTFETCH_TARGET_DIR_INSTALL_SYSCONF"/fastfetch/config.conf");
}
static void parseConfigFileUser(FFinstance* instance, FFdata* data)
{
if(!data->loadUserConfig)
return;
FF_LIST_FOR_EACH(FFstrbuf, filename, instance->state.configDirs)
for(uint32_t i = instance->state.configDirs.length; i > 0; --i)
{
uint32_t filenameLength = filename->length;
if(!data->loadUserConfig)
return;
ffStrbufAppendS(filename, "fastfetch/config.conf");
FFstrbuf* dir = ffListGet(&instance->state.configDirs, i - 1);
uint32_t dirLength = dir->length;
bool found = parseConfigFile(instance, data, filename->chars);
ffStrbufSubstrBefore(filename, filenameLength);
if(found) break;
ffStrbufAppendS(dir, "fastfetch/config.conf");
parseConfigFile(instance, data, dir->chars);
ffStrbufSubstrBefore(dir, dirLength);
}
}
@@ -1466,11 +1458,7 @@ int main(int argc, const char** argv)
ffStrbufInitA(&data.structure, 256);
data.loadUserConfig = true;
#ifndef _WIN32
parseConfigFileSystem(&instance, &data);
#endif
parseConfigFileUser(&instance, &data);
parseConfigFiles(&instance, &data);
parseArguments(&instance, &data, argc, argv);
//If we don't have a custom structure, use the default one