diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2020-11-21 23:13:19 +0100 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2020-11-22 22:00:32 +0100 |
| commit | cfde14234176b750da47890866f3d1023aa2e3a5 (patch) | |
| tree | 1cd1ac5bbad938ddc78465264f72d45723a28fe7 /updater/versions.go | |
| parent | conf: always use 64-bit registry view on 64-bit machines (diff) | |
| download | wireguard-windows-cfde14234176b750da47890866f3d1023aa2e3a5.tar.xz wireguard-windows-cfde14234176b750da47890866f3d1023aa2e3a5.zip | |
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>
Diffstat (limited to 'updater/versions.go')
| -rw-r--r-- | updater/versions.go | 6 |
1 files changed, 1 insertions, 5 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) { |