Browse code

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

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>

Tianon Gravi authored on 2016/04/26 02:40:07
Showing 4 changed files
... ...
@@ -1,7 +1,8 @@
1 1
 #!/bin/bash
2 2
 set -e
3 3
 
4
-BINARY_SHORT_NAME="docker"
5
-SOURCE_PATH="./client"
6
-
7
-source "${MAKEDIR}/.binary"
4
+(
5
+	export BINARY_SHORT_NAME='docker'
6
+	export SOURCE_PATH='./client'
7
+	source "${MAKEDIR}/.binary"
8
+)
... ...
@@ -1,8 +1,9 @@
1 1
 #!/bin/bash
2 2
 set -e
3 3
 
4
-BINARY_SHORT_NAME="dockerd"
5
-SOURCE_PATH="./docker"
6
-
7
-source "${MAKEDIR}/.binary"
8
-copy_containerd "$DEST" "hash"
4
+(
5
+	export BINARY_SHORT_NAME='dockerd'
6
+	export SOURCE_PATH='./docker'
7
+	source "${MAKEDIR}/.binary"
8
+	copy_containerd "$DEST" 'hash'
9
+)
... ...
@@ -2,9 +2,9 @@
2 2
 set -e
3 3
 
4 4
 (
5
-    export BINARY_SHORT_NAME="docker"
6
-    export SOURCE_PATH="./client"
7
-	export IAMSTATIC="false"
5
+	export BINARY_SHORT_NAME='docker'
6
+	export SOURCE_PATH='./client'
7
+	export IAMSTATIC='false'
8 8
 	export LDFLAGS_STATIC_DOCKER=''
9 9
 	export BUILDFLAGS=( "${BUILDFLAGS[@]/netgo /}" ) # disable netgo, since we don't need it for a dynamic binary
10 10
 	export BUILDFLAGS=( "${BUILDFLAGS[@]/static_build /}" ) # we're not building a "static" binary here
... ...
@@ -2,9 +2,9 @@
2 2
 set -e
3 3
 
4 4
 (
5
-    export BINARY_SHORT_NAME="dockerd"
6
-    export SOURCE_PATH="./docker"
7
-	export IAMSTATIC="false"
5
+	export BINARY_SHORT_NAME='dockerd'
6
+	export SOURCE_PATH='./docker'
7
+	export IAMSTATIC='false'
8 8
 	export LDFLAGS_STATIC_DOCKER=''
9 9
 	export BUILDFLAGS=( "${BUILDFLAGS[@]/netgo /}" ) # disable netgo, since we don't need it for a dynamic binary
10 10
 	export BUILDFLAGS=( "${BUILDFLAGS[@]/static_build /}" ) # we're not building a "static" binary here