Use os-release(5) for OS name detection; related changes. #40
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
added 3 commits
October 10, 2016 21:01
Create a global `os_release()` function that returns a dict containing the contents of the os-release file (use shlex to parse it). Accompanying this is the `OS_RELEASE` global, since I figure calling it multiple times is a waste. I'm not really sure that this was a good place to put it, but I didn't have a good sense of how you were trying to organize the program. Perhaps pass it around in the `state`? Now, because the old code in distroCheck.render was basically hard-coding the string "Arch Linux", but pretending to actually detect something, the code that used it to select the logo was a bit fragile. Instead, create a .logo() method on the Archey object that finds the most appropriate logo based on some logic describe below. This is better than trying to parse the output of the distro module. Archey.logo() goes through the PRETTY_NAME, NAME, ID, `uname -o`, and finally an empty string, until it finds a logo matching that string. This way we can be pretty robust in finding the most appropriate logo. I included the empty string at the end as an absolute; fallback and added a logo that is a giant "?" for it. This will allow, say, a "GNU/Linux" logo to be added that will show on otherwise unknown GNU/Linux distros, while still only showing the "?" logo on something else, like BSD. Finally, the distroCheck.render() code was updated to try PRETTY_NAME, NAME, then `uname -o`.
Previously, it looked for exactly one slash in a value to identify a fraction. This resulted in silly things like "GNU/Linux" being rendered as a fraction (the "GNU" becomes blue, or whatever the color is set to). Now, it inspects that there is exactly one slash, with at least one digit on each side of it. I didn't mandate entirely digits, because a fraction might include units.
|
I should add that I wouldn't be upset if you only wanted to merge the first two commits, and reject the third. |
|
Ping. |
|
This project has been abandoned for a while now (see #47). I (modestly) invite you to check out HorlogeSkynet/archey4. Cheers. |
HorlogeSkynet
pushed a commit
to HorlogeSkynet/archey4
that referenced
this pull request
Mar 11, 2021
> See related : lclarkmichalek/archey3#40 [skip ci] Co-authored-by: Luke Shumaker <[email protected]>
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.
This fixes issue #39 (which I opened).
I'd write a more detailed description, but I would just be duplicating the commit messages, so click the "…" to expand those.
Disclosure: This patchset makes archey3 suitable for use on Parabola GNU/Linux-libre, a fork of Arch Linux that I am a developer for.