1. docker
  2. Commit b298960aed8155e7dbedb6602cdbb42eacee83f7
Browse code

Update bundlescripts to use "set -e" consistently

"set -e" is already inherited here from make.sh, but explicit is always better than implicit (hence the "set -e" in the first place!)

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)

Tianon Gravi authored on 2014/04/08 13:14:19
Showing 9 changed files
hack/make/binary
History View file @ b298960
... ... 
@@ -1,4 +1,5 @@
1 1 
 #!/bin/bash
2 
+set -e
2 3
3 4 
 DEST=$1
4 5
hack/make/cover
History View file @ b298960
... ... 
@@ -1,4 +1,5 @@
1 1 
 #!/bin/bash
2 
+set -e
2 3
3 4 
 DEST="$1"
4 5
hack/make/cross
History View file @ b298960
... ... 
@@ -1,4 +1,5 @@
1 1 
 #!/bin/bash
2 
+set -e
2 3
3 4 
 DEST=$1
4 5
hack/make/dynbinary
History View file @ b298960
... ... 
@@ -1,4 +1,5 @@
1 1 
 #!/bin/bash
2 
+set -e
2 3
3 4 
 DEST=$1
4 5
hack/make/dyntest
History View file @ b298960
... ... 
@@ -1,10 +1,9 @@
1 1 
 #!/bin/bash
2 
+set -e
2 3
3 4 
 DEST=$1
4 5 
 INIT=$DEST/../dynbinary/dockerinit-$VERSION
5 6
6 
-set -e
7 
-
8 7 
 if [ ! -x "$INIT" ]; then
9 8 
 	echo >&2 'error: dynbinary must be run before dyntest'
10 9 
 	false
hack/make/dyntest-integration
History View file @ b298960
... ... 
@@ -1,10 +1,9 @@
1 1 
 #!/bin/bash
2 
+set -e
2 3
3 4 
 DEST=$1
4 5 
 INIT=$DEST/../dynbinary/dockerinit-$VERSION
5 6
6 
-set -e
7 
-
8 7 
 if [ ! -x "$INIT" ]; then
9 8 
 	echo >&2 'error: dynbinary must be run before dyntest-integration'
10 9 
 	false
hack/make/test
History View file @ b298960
... ... 
@@ -1,9 +1,8 @@
1 1 
 #!/bin/bash
2 
+set -e
2 3
3 4 
 DEST=$1
4 5
5 
-set -e
6 
-
7 6 
 RED=$'\033[31m'
8 7 
 GREEN=$'\033[32m'
9 8 
 TEXTRESET=$'\033[0m' # reset the foreground colour
hack/make/test-integration
History View file @ b298960
... ... 
@@ -1,9 +1,8 @@
1 1 
 #!/bin/bash
2 
+set -e
2 3
3 4 
 DEST=$1
4 5
5 
-set -e
6 
-
7 6 
 bundle_test_integration() {
8 7 
 	LDFLAGS="$LDFLAGS $LDFLAGS_STATIC_DOCKER" go_test_dir ./integration \
9 8 
 		"-coverpkg $(find_dirs '*.go' | sed 's,^\.,github.com/dotcloud/docker,g' | paste -d, -s)"
hack/make/test-integration-cli
History View file @ b298960
... ... 
@@ -1,9 +1,8 @@
1 1 
 #!/bin/bash
2 
+set -e
2 3
3 4 
 DEST=$1
4 5
5 
-set -e
6 
-
7 6 
 DOCKER_GRAPHDRIVER=${DOCKER_GRAPHDRIVER:-vfs}
8 7 
 DOCKER_EXECDRIVER=${DOCKER_EXECDRIVER:-native}
9 8