Merge pull request #5072 from tianon/hack-set-e-consistently

Update bundlescripts to use "set -e" consistently
Upstream-commit: 28e7e814795fce2a75e4767a6707a6e4d03fa8b6
Component: engine

components/engine/hack/make/binary

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 DEST=$1
 

components/engine/hack/make/cover

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 DEST="$1"
 

components/engine/hack/make/cross

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 DEST=$1
 

components/engine/hack/make/dynbinary

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 DEST=$1
 

components/engine/hack/make/dyntest

@@ -1,10 +1,9 @@
 #!/bin/bash
+set -e
 
 DEST=$1
 INIT=$DEST/../dynbinary/dockerinit-$VERSION
 
-set -e
-
 if [ ! -x "$INIT" ]; then
 	echo >&2 'error: dynbinary must be run before dyntest'
 	false

components/engine/hack/make/dyntest-integration

@@ -1,10 +1,9 @@
 #!/bin/bash
+set -e
 
 DEST=$1
 INIT=$DEST/../dynbinary/dockerinit-$VERSION
 
-set -e
-
 if [ ! -x "$INIT" ]; then
 	echo >&2 'error: dynbinary must be run before dyntest-integration'
 	false

components/engine/hack/make/test

@@ -1,9 +1,8 @@
 #!/bin/bash
+set -e
 
 DEST=$1
 
-set -e
-
 RED=$'\033[31m'
 GREEN=$'\033[32m'
 TEXTRESET=$'\033[0m' # reset the foreground colour

components/engine/hack/make/test-integration

@@ -1,9 +1,8 @@
 #!/bin/bash
+set -e
 
 DEST=$1
 
-set -e
-
 bundle_test_integration() {
 	LDFLAGS="$LDFLAGS $LDFLAGS_STATIC_DOCKER" go_test_dir ./integration \
 		"-coverpkg $(find_dirs '*.go' | sed 's,^\.,github.com/dotcloud/docker,g' | paste -d, -s)"

components/engine/hack/make/test-integration-cli

@@ -1,9 +1,8 @@
 #!/bin/bash
+set -e
 
 DEST=$1
 
-set -e
-
 DOCKER_GRAPHDRIVER=${DOCKER_GRAPHDRIVER:-vfs}
 DOCKER_EXECDRIVER=${DOCKER_EXECDRIVER:-native}