Support for finding fortune files from XDG_DATA_DIRS #77
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.
Resolves #74.
This reworks support for FORTDIR/OFFDIR and LOCFORTDIR/LOCOFFDIR to support any amount of directories. I've also refactored the fortune file lookup logic to be more sensible.
My intention for the new lookup logic is as follows:
/
or./
or../
, then treat it as absolute/relative to current directory. Don't do any further processing.-o
, strip that suffix and look in offensive dirs instead of regular fortune dirs. This matches the BSD-compatibility feature.<fortdir>
(out of paths in$XDG_DATA_DIR
, FORTDIR, and LOCFORTDIR, or the corresponding offensive dirs):<lang>
, try<fortdir>/<lang>/<name>
, then try<fortdir>/<name>
Does this look ok?
Remaining work:
all
argument e.g.fortune 9% all