version: unify architecture string handling

Always report native architecture and use "x86" instead of "386" for all
identification strings, except when explicitly stating the Go verison.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

3 files changed, 1 insertions, 61 deletions

diff --git a/updater/versions.go b/updater/versions.go
index 08830d32..0ac1b5eb 100644
--- a/updater/versions.go
+++ b/updater/versions.go
@@ -54,11 +54,7 @@ func versionNewerThanUs(candidate string) (bool, error) {
 }
 
 func findCandidate(candidates fileList) (*UpdateFound, error) {
-	arch, err := findArch()
-	if err != nil {
-		return nil, err
-	}
-	prefix := fmt.Sprintf(msiArchPrefix, arch)
+	prefix := fmt.Sprintf(msiArchPrefix, version.NativeArch())
 	suffix := msiSuffix
 	for name, hash := range candidates {
 		if strings.HasPrefix(name, prefix) && strings.HasSuffix(name, suffix) {
diff --git a/updater/versions_arm.go b/updater/versions_arm.go
deleted file mode 100644
index 45b53be5..00000000
--- a/updater/versions_arm.go
+++ /dev/null
@@ -1,28 +0,0 @@
-/* SPDX-License-Identifier: MIT
- *
- * Copyright (C) 2019-2020 WireGuard LLC. All Rights Reserved.
- */
-
-package updater
-
-import (
-	"debug/pe"
-	"errors"
-
-	"golang.org/x/sys/windows"
-)
-
-func findArch() (string, error) {
-	var processMachine, nativeMachine uint16
-	err := windows.IsWow64Process2(windows.CurrentProcess(), &processMachine, &nativeMachine)
-	if err != nil {
-		return "", err
-	}
-	switch nativeMachine {
-	case pe.IMAGE_FILE_MACHINE_ARM64:
-		return "arm64", nil
-	case pe.IMAGE_FILE_MACHINE_ARMNT:
-		return "arm", nil
-	}
-	return "", errors.New("Invalid GOARCH")
-}
diff --git a/updater/versions_default.go b/updater/versions_default.go
deleted file mode 100644
index 268e97ce..00000000
--- a/updater/versions_default.go
+++ /dev/null
@@ -1,28 +0,0 @@
-// +build !arm
-
-/* SPDX-License-Identifier: MIT
- *
- * Copyright (C) 2019-2020 WireGuard LLC. All Rights Reserved.
- */
-
-package updater
-
-import (
-	"errors"
-	"runtime"
-)
-
-func findArch() (arch string, err error) {
-	if runtime.GOARCH == "amd64" {
-		arch = "amd64"
-	} else if runtime.GOARCH == "386" {
-		arch = "x86"
-	} else if runtime.GOARCH == "arm" {
-		arch = "arm"
-	} else if runtime.GOARCH == "arm64" {
-		arch = "arm64"
-	} else {
-		err = errors.New("Invalid GOARCH")
-	}
-	return
-}