Zander671/Waybar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4373 from Arkoniak/4354-wildcard-config-regression

Browse Source 
bugfix: expanding wildcards in config includes (#4354)
This commit is contained in:
Alexis Rouillard
2025-10-01 14:23:31 +02:00
committed by GitHub
parent c7a77f2c08 691e66a7fd
commit 3cc5943c08
7 changed files with 76 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/config.hpp
View File

@ -35,7 +35,8 @@ class Config {
void setupConfig(Json::Value &dst, const std::string &config_file, int depth);
void resolveConfigIncludes(Json::Value &config, int depth);
void mergeConfig(Json::Value &a_config_, Json::Value &b_config_);
static std::optional<std::string> findIncludePath(const std::string &name);
static std::vector<std::string> findIncludePath(
const std::string &name, const std::vector<std::string> &dirs = CONFIG_DIRS);
std::string config_file_;