Skip to content

Commit b298960

Browse files
committed
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)
1 parent 7c37cae commit b298960

File tree

9 files changed

+9
-10
lines changed

9 files changed

+9
-10
lines changed

hack/make/binary

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/bin/bash
2+
set -e
23

34
DEST=$1
45

hack/make/cover

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/bin/bash
2+
set -e
23

34
DEST="$1"
45

hack/make/cross

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/bin/bash
2+
set -e
23

34
DEST=$1
45

hack/make/dynbinary

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/bin/bash
2+
set -e
23

34
DEST=$1
45

hack/make/dyntest

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
#!/bin/bash
2+
set -e
23

34
DEST=$1
45
INIT=$DEST/../dynbinary/dockerinit-$VERSION
56

6-
set -e
7-
87
if [ ! -x "$INIT" ]; then
98
echo >&2 'error: dynbinary must be run before dyntest'
109
false

hack/make/dyntest-integration

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
#!/bin/bash
2+
set -e
23

34
DEST=$1
45
INIT=$DEST/../dynbinary/dockerinit-$VERSION
56

6-
set -e
7-
87
if [ ! -x "$INIT" ]; then
98
echo >&2 'error: dynbinary must be run before dyntest-integration'
109
false

hack/make/test

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#!/bin/bash
2+
set -e
23

34
DEST=$1
45

5-
set -e
6-
76
RED=$'\033[31m'
87
GREEN=$'\033[32m'
98
TEXTRESET=$'\033[0m' # reset the foreground colour

hack/make/test-integration

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#!/bin/bash
2+
set -e
23

34
DEST=$1
45

5-
set -e
6-
76
bundle_test_integration() {
87
LDFLAGS="$LDFLAGS $LDFLAGS_STATIC_DOCKER" go_test_dir ./integration \
98
"-coverpkg $(find_dirs '*.go' | sed 's,^\.,github.com/dotcloud/docker,g' | paste -d, -s)"

hack/make/test-integration-cli

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#!/bin/bash
2+
set -e
23

34
DEST=$1
45

5-
set -e
6-
76
DOCKER_GRAPHDRIVER=${DOCKER_GRAPHDRIVER:-vfs}
87
DOCKER_EXECDRIVER=${DOCKER_EXECDRIVER:-native}
98

0 commit comments

Comments
 (0)