From bf3bb888512e74bee0b79bd38826cb019ca2a0ee Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Thu, 28 Jan 2021 17:23:39 +0100 Subject: device: remove version string This is what modules are for, and Go binaries can introspect. Signed-off-by: Jason A. Donenfeld --- Makefile | 8 ++++---- main.go | 4 ++-- main_windows.go | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 1b77f86..223766b 100644 --- a/Makefile +++ b/Makefile @@ -10,10 +10,10 @@ MAKEFLAGS += --no-print-directory generate-version-and-build: @export GIT_CEILING_DIRECTORIES="$(realpath $(CURDIR)/..)" && \ tag="$$(git describe --dirty 2>/dev/null)" && \ - ver="$$(printf 'package device\nconst WireGuardGoVersion = "%s"\n' "$${tag#v}")" && \ - [ "$$(cat device/version.go 2>/dev/null)" != "$$ver" ] && \ - echo "$$ver" > device/version.go && \ - git update-index --assume-unchanged device/version.go || true + ver="$$(printf 'package main\nconst Version = "%s"\n' "$$tag")" && \ + [ "$$(cat version.go 2>/dev/null)" != "$$ver" ] && \ + echo "$$ver" > version.go && \ + git update-index --assume-unchanged version.go || true @$(MAKE) wireguard-go wireguard-go: $(wildcard *.go) $(wildcard */*.go) diff --git a/main.go b/main.go index 40c8070..721a2ed 100644 --- a/main.go +++ b/main.go @@ -55,7 +55,7 @@ func warning() { func main() { if len(os.Args) == 2 && os.Args[1] == "--version" { - fmt.Printf("wireguard-go v%s\n\nUserspace WireGuard daemon for %s-%s.\nInformation available at https://www.wireguard.com.\nCopyright (C) Jason A. Donenfeld .\n", device.WireGuardGoVersion, runtime.GOOS, runtime.GOARCH) + fmt.Printf("wireguard-go v%s\n\nUserspace WireGuard daemon for %s-%s.\nInformation available at https://www.wireguard.com.\nCopyright (C) Jason A. Donenfeld .\n", Version, runtime.GOOS, runtime.GOARCH) return } @@ -141,7 +141,7 @@ func main() { fmt.Sprintf("(%s) ", interfaceName), ) - logger.Verbosef("Starting wireguard-go version %s", device.WireGuardGoVersion) + logger.Verbosef("Starting wireguard-go version %s", Version) if err != nil { logger.Errorf("Failed to create TUN device: %v", err) diff --git a/main_windows.go b/main_windows.go index 82a333d..7835a17 100644 --- a/main_windows.go +++ b/main_windows.go @@ -34,7 +34,7 @@ func main() { device.LogLevelVerbose, fmt.Sprintf("(%s) ", interfaceName), ) - logger.Verbosef("Starting wireguard-go version %s", device.WireGuardGoVersion) + logger.Verbosef("Starting wireguard-go version %s", Version) tun, err := tun.CreateTUN(interfaceName, 0) if err == nil { -- cgit v1.2.3