require: fix conf.d support #927
Open
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
Some time ago support for conf.d was added but it is currently broken if the package does not have an `init.fish` file, given that `require` enumerates packages through a glob on the existence of `init.fish`. This fixes this requirement by globbing both `init.fish` and `conf.d` entries in the `OMF_PATH`. This does generate duplicated entries, but given that `require` already protects against double requires, this should be safe.
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.
Description
Some time ago support for conf.d was added but it is currently broken if the package does not have an
init.fishfile, given thatrequireenumerates packages through a glob on the existence ofinit.fish.This fixes this requirement by globbing both
init.fishandconf.dentries in theOMF_PATH. This does generate duplicated entries, but given thatrequirealready protects against double requires, this should be safe.