use XDG_DATA_DIRS to locate mime database #163
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
|
@jellybob could you have a look? |
| @@ -3,7 +3,15 @@ require "rake/clean" | |||
|
|
|||
| def locate_mime_database | |||
| possible_paths = [ | |||
| (File.expand_path(ENV["FREEDESKTOP_MIME_TYPES_PATH"]) if ENV["FREEDESKTOP_MIME_TYPES_PATH"]), | |||
| (File.expand_path(ENV["FREEDESKTOP_MIME_TYPES_PATH"]) if ENV["FREEDESKTOP_MIME_TYPES_PATH"]) | |||
There was a problem hiding this comment.
[suggestion]
Should you consider creating a small method called listPossiblePaths and avoid having these hard-to-read (IMHO) lines?
For example:
def listPossibleMimePaths
paths = []
paths = File.expand_path(ENV["FREEDESKTOP_MIME_TYPES_PATH"] if ENV["FREEDESKTOP_MIME_TYPES_PATH"]
...
paths
end| (File.expand_path(ENV["FREEDESKTOP_MIME_TYPES_PATH"]) if ENV["FREEDESKTOP_MIME_TYPES_PATH"]), | ||
| (File.expand_path(ENV["FREEDESKTOP_MIME_TYPES_PATH"]) if ENV["FREEDESKTOP_MIME_TYPES_PATH"]) | ||
| ] + ( | ||
| if ENV["XDG_DATA_DIRS"] |
There was a problem hiding this comment.
[suggestion]
If you use ENV.fetch with [] as default you can avoid one extra if statement. Check it here.
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.
I ran into issue #160. Not all operating systems are using /usr or /opt and
XDG_DATA_DIRSwas made to avoid hard-coding paths like /usr and /opt. This PR makes use ofXDG_DATA_DIRSwhile still maintaining compatibility with systems that do not haveXDG_DATA_DIRS.On my system
XDG_DATA_DIRSlooks like:Fixes #160
Possible replacement for #125