@@ -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'

@@ -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 \

deleted file mode 100644

@@ -1,24 +0,0 @@

-#!/bin/bash

-

-rm -rf autogen

-mkdir -p autogen/dockerversion

-cat > autogen/dockerversion/dockerversion.go <<EOF

-// AUTOGENERATED FILE; see $BASH_SOURCE

-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"

-)

-EOF

new file mode 100644

@@ -0,0 +1,18 @@

+#!/bin/bash

+

+rm -rf autogen

+

+mkdir -p autogen/dockerversion

+cat > autogen/dockerversion/dockerversion.go <<EOF

+// AUTOGENERATED FILE; see $BASH_SOURCE

+package dockerversion

+

+var (

+	GITCOMMIT string = "$GITCOMMIT"

+	VERSION   string = "$VERSION"

+

+	IAMSTATIC string = "${IAMSTATIC:-true}"

+	INITSHA1  string = "$DOCKER_INITSHA1"

+	INITPATH  string = "$DOCKER_INITPATH"

+)

+EOF

@@ -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" \