control/controlclient: use API to get Windows version number

Fixes #1478

Signed-off-by: Aleksandar Pesic <peske.nis@gmail.com>
This commit is contained in:
Aleksandar Pesic
2021-03-13 01:30:26 +01:00
committed by Brad Fitzpatrick
parent 2bc518dcb2
commit 4224b3f731
2 changed files with 33 additions and 15 deletions
+5 -15
View File
@@ -5,9 +5,9 @@
package controlclient
import (
"os/exec"
"strings"
"syscall"
"fmt"
"golang.org/x/sys/windows"
)
func init() {
@@ -15,16 +15,6 @@ func init() {
}
func osVersionWindows() string {
cmd := exec.Command("cmd", "/c", "ver")
cmd.SysProcAttr = &syscall.SysProcAttr{HideWindow: true}
out, _ := cmd.Output() // "\nMicrosoft Windows [Version 10.0.19041.388]\n\n"
s := strings.TrimSpace(string(out))
s = strings.TrimPrefix(s, "Microsoft Windows [")
s = strings.TrimSuffix(s, "]")
// "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
major, minor, build := windows.RtlGetNtVersionNumbers()
return fmt.Sprintf("%d.%d.%d", major, minor, build)
}