Better os version handling #3448
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
jyrkive
reviewed
Aug 10, 2018
src/desktop/version.cpp
Outdated
| #endif | ||
|
|
||
| // | ||
| // POSIX uname version. |
There was a problem hiding this comment.
Please don't remove this code. It's a fallback in case /etc/lsb_release doesn't exist.
jyrkive
reviewed
Aug 10, 2018
src/desktop/version.cpp
Outdated
| @@ -151,6 +151,22 @@ std::string os_version() | |||
| if(!ver.empty()) { | |||
| return ver; | |||
| } | |||
| } else { | |||
There was a problem hiding this comment.
It's better to not use else for this, in case /etc/lsb_release is empty (see the check right above).
|
If you don't like my idea with renaming namespaces to |
jyrkive
reviewed
Aug 11, 2018
src/desktop/version.cpp
Outdated
| // | ||
|
|
||
src/desktop/version.cpp
Outdated
| utsname u; | ||
|
|
||
src/desktop/version.cpp
Outdated
| if(uname(&u) != 0) { | ||
| ERR_DU << "os_version: uname error (" << strerror(errno) << ")\n"; | ||
| } | ||
|
|
||
| return formatter() << u.sysname << ' ' | ||
|
|
src/desktop/version.cpp
Outdated
|
|
||
| return formatter() << u.sysname << ' ' | ||
| return formatter() << u.sysname << ' ' |
There was a problem hiding this comment.
Please don't try to align the fields (they are not aligned; note that the following lines are indented with tabs).
|
Thank you for the pull request! 👍 |
jyrkive
pushed a commit
to jyrkive/wesnoth
that referenced
this pull request
Aug 11, 2018
This new implementation works more reliably, avoids spawning subshells, and is faster.
jostephd
pushed a commit
to jostephd/wesnoth
that referenced
this pull request
Oct 6, 2018
This new implementation works more reliably, avoids spawning subshells, and is faster.
jostephd
pushed a commit
to jostephd/wesnoth
that referenced
this pull request
Oct 7, 2018
This new implementation works more reliably, avoids spawning subshells, and is faster. (cherry-picked from commit 4282ee3)
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.
Old os version detection was in case of macOS buggy so I reworked it. It is faster now and native.
TODO
Idea
I used
desktop::apple::os_version()namespace. It may be nice to rework rest of platform specific code to use this namespace style (not only os_version, but also notifications, ...)