Browse Source

Tweak hack/make/*-{client,daemon} to be consistent

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Tianon Gravi 9 years ago
parent
commit
626d25a7d9
4 changed files with 17 additions and 15 deletions
  1. 5 4
      hack/make/binary-client
  2. 6 5
      hack/make/binary-daemon
  3. 3 3
      hack/make/dynbinary-client
  4. 3 3
      hack/make/dynbinary-daemon

+ 5 - 4
hack/make/binary-client

@@ -1,7 +1,8 @@
 #!/bin/bash
 #!/bin/bash
 set -e
 set -e
 
 
-BINARY_SHORT_NAME="docker"
-SOURCE_PATH="./client"
-
-source "${MAKEDIR}/.binary"
+(
+	export BINARY_SHORT_NAME='docker'
+	export SOURCE_PATH='./client'
+	source "${MAKEDIR}/.binary"
+)

+ 6 - 5
hack/make/binary-daemon

@@ -1,8 +1,9 @@
 #!/bin/bash
 #!/bin/bash
 set -e
 set -e
 
 
-BINARY_SHORT_NAME="dockerd"
-SOURCE_PATH="./docker"
-
-source "${MAKEDIR}/.binary"
-copy_containerd "$DEST" "hash"
+(
+	export BINARY_SHORT_NAME='dockerd'
+	export SOURCE_PATH='./docker'
+	source "${MAKEDIR}/.binary"
+	copy_containerd "$DEST" 'hash'
+)

+ 3 - 3
hack/make/dynbinary-client

@@ -2,9 +2,9 @@
 set -e
 set -e
 
 
 (
 (
-    export BINARY_SHORT_NAME="docker"
-    export SOURCE_PATH="./client"
-	export IAMSTATIC="false"
+	export BINARY_SHORT_NAME='docker'
+	export SOURCE_PATH='./client'
+	export IAMSTATIC='false'
 	export LDFLAGS_STATIC_DOCKER=''
 	export LDFLAGS_STATIC_DOCKER=''
 	export BUILDFLAGS=( "${BUILDFLAGS[@]/netgo /}" ) # disable netgo, since we don't need it for a dynamic binary
 	export BUILDFLAGS=( "${BUILDFLAGS[@]/netgo /}" ) # disable netgo, since we don't need it for a dynamic binary
 	export BUILDFLAGS=( "${BUILDFLAGS[@]/static_build /}" ) # we're not building a "static" binary here
 	export BUILDFLAGS=( "${BUILDFLAGS[@]/static_build /}" ) # we're not building a "static" binary here

+ 3 - 3
hack/make/dynbinary-daemon

@@ -2,9 +2,9 @@
 set -e
 set -e
 
 
 (
 (
-    export BINARY_SHORT_NAME="dockerd"
-    export SOURCE_PATH="./docker"
-	export IAMSTATIC="false"
+	export BINARY_SHORT_NAME='dockerd'
+	export SOURCE_PATH='./docker'
+	export IAMSTATIC='false'
 	export LDFLAGS_STATIC_DOCKER=''
 	export LDFLAGS_STATIC_DOCKER=''
 	export BUILDFLAGS=( "${BUILDFLAGS[@]/netgo /}" ) # disable netgo, since we don't need it for a dynamic binary
 	export BUILDFLAGS=( "${BUILDFLAGS[@]/netgo /}" ) # disable netgo, since we don't need it for a dynamic binary
 	export BUILDFLAGS=( "${BUILDFLAGS[@]/static_build /}" ) # we're not building a "static" binary here
 	export BUILDFLAGS=( "${BUILDFLAGS[@]/static_build /}" ) # we're not building a "static" binary here