Allow using wildcards in config include paths #3862
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Updates `Config::tryExpandPath()` to return a vector of expanded path matches instead of a single path wrapped in an optional, with an empty vector indicating no matches. `Config::resolveConfigIncludes()` iterates over all of these matches, while other instances of path expansion (such as finding the base config path) retain their existing behavior and only use the first match.
|
LGTM, thx! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Since Waybar supports including additional configuration files using the
"include"key, I expected to be able to use wildcards in the paths passed in. For example, a drop-in config directory:Currently, this almost works.
Config::tryExpandPath()already expands wildcards usingwordexp(), but only takes the first result and discards the rest.This PR updates
Config::tryExpandPath()to return a vector of expanded path matches instead of a single path wrapped in an optional, with an empty vector indicating no matches.Config::resolveConfigIncludes()iterates over all of these matches, while other instances of path expansion (such as finding the base config path) retain their existing behavior and only use the first match.