From 626d25a7d94aa05427ecb85ba73bad1e8738c57b Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 25 Apr 2016 10:40:07 -0700 Subject: [PATCH] Tweak hack/make/*-{client,daemon} to be consistent Signed-off-by: Andrew "Tianon" Page --- hack/make/binary-client | 9 +++++---- hack/make/binary-daemon | 11 ++++++----- hack/make/dynbinary-client | 6 +++--- hack/make/dynbinary-daemon | 6 +++--- 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/hack/make/binary-client b/hack/make/binary-client index 057c618cb3..6e1f739768 100644 --- a/hack/make/binary-client +++ b/hack/make/binary-client @@ -1,7 +1,8 @@ #!/bin/bash set -e -BINARY_SHORT_NAME="docker" -SOURCE_PATH="./client" - -source "${MAKEDIR}/.binary" +( + export BINARY_SHORT_NAME='docker' + export SOURCE_PATH='./client' + source "${MAKEDIR}/.binary" +) diff --git a/hack/make/binary-daemon b/hack/make/binary-daemon index 4bc40eaed7..556ca550da 100644 --- a/hack/make/binary-daemon +++ b/hack/make/binary-daemon @@ -1,8 +1,9 @@ #!/bin/bash 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' +) diff --git a/hack/make/dynbinary-client b/hack/make/dynbinary-client index 22f0dd6ed5..1c99e2684f 100644 --- a/hack/make/dynbinary-client +++ b/hack/make/dynbinary-client @@ -2,9 +2,9 @@ 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 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 diff --git a/hack/make/dynbinary-daemon b/hack/make/dynbinary-daemon index c647c9cfa0..d8d16ad39e 100644 --- a/hack/make/dynbinary-daemon +++ b/hack/make/dynbinary-daemon @@ -2,9 +2,9 @@ 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 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