lzc256
/
tailscale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

control/controlclient: deal with localized 'Version' string getting Windows version

pull/757/head
Brad Fitzpatrick 2020-09-13 10:06:20 -07:00
parent 4f7751e025
commit 662c19551a
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
control/controlclient/hostinfo_windows.go
View File

@ -21,6 +21,10 @@ func osVersionWindows() string {
s := strings.TrimSpace(string(out)) s := strings.TrimSpace(string(out))
s = strings.TrimPrefix(s, "Microsoft Windows [") s = strings.TrimPrefix(s, "Microsoft Windows [")
s = strings.TrimSuffix(s, "]") s = strings.TrimSuffix(s, "]")
s = strings.TrimPrefix(s, "Version ") // is this localized? do it last in case.
return s // "10.0.19041.388", ideally // "Version 10.x.y.z", with "Version" localized. Keep only stuff after the space.
if sp := strings.Index(s, " "); sp != -1 {
s = s[sp+1:]
}
return s // "10.0.19041.388", ideally
} }