From 8625a281c66180af867f59a041560bf5035ae404 Mon Sep 17 00:00:00 2001
From: Tianon Gravi <admwiggin@gmail.com>
Date: Tue, 3 Mar 2015 12:41:26 -0700
Subject: [PATCH] Rename .dockerversion to .go-autogen so it's clear that all
 autogenerated code goes here

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
---
 project/make.sh                              | 2 +-
 project/make/.dockerinit                     | 2 +-
 project/make/{.dockerversion => .go-autogen} | 8 +-------
 project/make/binary                          | 2 +-
 4 files changed, 4 insertions(+), 10 deletions(-)
 rename project/make/{.dockerversion => .go-autogen} (75%)

diff --git a/project/make.sh b/project/make.sh
index ec880df39..0db70a750 100755
--- a/project/make.sh
+++ b/project/make.sh
@@ -101,7 +101,7 @@ fi
 # Use these flags when compiling the tests and final binary
 
 IAMSTATIC='true'
-source "$(dirname "$BASH_SOURCE")/make/.dockerversion"
+source "$(dirname "$BASH_SOURCE")/make/.go-autogen"
 LDFLAGS='-w'
 
 LDFLAGS_STATIC='-linkmode external'
diff --git a/project/make/.dockerinit b/project/make/.dockerinit
index 0f51fce0a..f98158d0b 100644
--- a/project/make/.dockerinit
+++ b/project/make/.dockerinit
@@ -2,7 +2,7 @@
 set -e
 
 IAMSTATIC="true"
-source "$(dirname "$BASH_SOURCE")/.dockerversion"
+source "$(dirname "$BASH_SOURCE")/.go-autogen"
 
 # dockerinit still needs to be a static binary, even if docker is dynamic
 go build \
diff --git a/project/make/.dockerversion b/project/make/.go-autogen
similarity index 75%
rename from project/make/.dockerversion
rename to project/make/.go-autogen
index c96ff065b..1b48f611e 100644
--- a/project/make/.dockerversion
+++ b/project/make/.go-autogen
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 rm -rf autogen
+
 mkdir -p autogen/dockerversion
 cat > autogen/dockerversion/dockerversion.go <<EOF
 // AUTOGENERATED FILE; see $BASH_SOURCE
@@ -9,14 +10,7 @@ package dockerversion
 var (
 	GITCOMMIT string = "$GITCOMMIT"
 	VERSION   string = "$VERSION"
-)
-EOF
 
-cat > autogen/dockerversion/static.go <<EOF
-// AUTOGENERATED FILE; see $BASH_SOURCE
-package dockerversion
-
-var (
 	IAMSTATIC string = "${IAMSTATIC:-true}"
 	INITSHA1  string = "$DOCKER_INITSHA1"
 	INITPATH  string = "$DOCKER_INITPATH"
diff --git a/project/make/binary b/project/make/binary
index edc38a640..06d640dd4 100755
--- a/project/make/binary
+++ b/project/make/binary
@@ -11,7 +11,7 @@ if [[ "$(uname -s)" == CYGWIN* ]]; then
 	DEST=$(cygpath -mw $DEST)
 fi
 
-source "$(dirname "$BASH_SOURCE")/.dockerversion"
+source "$(dirname "$BASH_SOURCE")/.go-autogen"
 
 go build \
 	-o "$DEST/$BINARY_FULLNAME" \