0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

desktop: Handle versions of lsb_release that wrap -s output in quotes

Browse source
This commit is contained in:
Ignacio R. Morelle 2015-08-23 04:44:27 -03:00
parent 612d0b232f
commit e43a4a3ebd
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/desktop/version.cpp
View file

@ -152,8 +152,14 @@ std::string os_version()
static const std::string cmdline = lsb_release_bin + " -s -d";
scoped_posix_pipe p(popen(cmdline.c_str(), "r"));
const std::string& ver = read_pipe_line(p);
std::string ver = read_pipe_line(p);
if(ver.length() >= 2 && ver[0] == '"' && ver[ver.length() - 1] == '"') {
ver.erase(ver.length() - 1, 1);
ver.erase(0, 1);
}
// Check this again in case we got "" above for some weird reason.
if(!ver.empty()) {
return ver;
}