From 39bbb86b09263730de091ba5a910d7bdd2dccbce Mon Sep 17 00:00:00 2001
From: David Anderson <danderson@tailscale.com>
Date: Tue, 3 Nov 2020 14:39:45 -0800
Subject: [PATCH] build_dist: fix after version refactor.

---
 build_dist.sh | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/build_dist.sh b/build_dist.sh
index 07d82a4c1..4a88b1fb4 100755
--- a/build_dist.sh
+++ b/build_dist.sh
@@ -9,12 +9,8 @@
 # this script, or executing equivalent commands in your
 # distro-specific build system.
 
-set -euo pipefail
+set -eu
 
-describe=$(./version/describe.sh)
-commit=$(git rev-parse --verify --quiet HEAD)
+eval $(./version/version.sh)
 
-long=$(./version/mkversion.sh long "$describe" "")
-short=$(./version/mkversion.sh short "$describe" "")
-
-exec go build -tags xversion -ldflags "-X tailscale.com/version.Long=${long} -X tailscale.com/version.Short=${short} -X tailscale.com/version.GitCommit=${commit}" "$@"
+exec go build -tags xversion -ldflags "-X tailscale.com/version.Long=${VERSION_LONG} -X tailscale.com/version.Short=${VERSION_SHORT} -X tailscale.com/version.GitCommit=${VERSION_GIT_HASH}" "$@"