Normalize some of the boilerplate in each of the build commands.

duda · Oct 10, 2014 · 428a653 · 428a653
1 parent 7a2d8fd
commit 428a653
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 30 deletions.
diff --git a/build/copy-output.sh b/build/copy-output.sh
@@ -19,9 +19,7 @@
 # This is a no-op on Linux when the Docker daemon is local.  This is only
 # necessary on Mac OS X with boot2docker.
 
-set -e
-
-source $(dirname $0)/common.sh
+source $(dirname "${BASH_SOURCE}")/common.sh
 
 kube::build::verify_prereqs
 kube::build::copy_output
diff --git a/build/make-binaries.sh b/build/make-binaries.sh
@@ -19,9 +19,7 @@
 # This makes the docker build image, builds the binaries and copies them out
 # of the docker container.
 
-set -e
-
-source $(dirname $0)/common.sh
+source $(dirname "${BASH_SOURCE}")/common.sh
 
 kube::build::verify_prereqs
 kube::build::build_image

diff --git a/build/make-build-image.sh b/build/make-build-image.sh
@@ -21,9 +21,7 @@
 # directory.  It will then copy over the Dockerfile and build the kube-build
 # image.
 
-set -e
-
-source $(dirname $0)/common.sh
+source $(dirname "${BASH_SOURCE}")/common.sh
 
 kube::build::verify_prereqs
 kube::build::build_image
diff --git a/build/make-clean.sh b/build/make-clean.sh
@@ -16,9 +16,7 @@
 
 # Clean out the output directory on the docker host.
 
-set -e
-
-source $(dirname $0)/common.sh
+source $(dirname "${BASH_SOURCE}")/common.sh
 
 kube::build::verify_prereqs
 kube::build::clean_output

diff --git a/build/make-cross.sh b/build/make-cross.sh
@@ -19,9 +19,7 @@
 # This makes the docker build image, builds the cross binaries and copies them
 # out of the docker container.
 
-set -e
-
-source $(dirname $0)/common.sh
+source $(dirname "${BASH_SOURCE}")/common.sh
 
 kube::build::verify_prereqs
 kube::build::build_image

diff --git a/build/make-run-image.sh b/build/make-run-image.sh
@@ -19,9 +19,7 @@
 # This script will make the 'run image' after building all of the necessary
 # binaries.
 
-set -e
-
-source $(dirname $0)/common.sh
+source $(dirname "${BASH_SOURCE}")/common.sh
 
 kube::build::verify_prereqs
 kube::build::build_image

diff --git a/build/release.sh b/build/release.sh
@@ -18,9 +18,7 @@
 # images and other build artifacts.  All intermediate artifacts will be hosted
 # publicly on Google Cloud Storage currently.
 
-set -e
-
-source $(dirname $0)/common.sh
+source $(dirname "${BASH_SOURCE}")/common.sh
 
 kube::build::verify_prereqs
 kube::build::build_image

diff --git a/build/run-integration.sh b/build/run-integration.sh
@@ -16,9 +16,7 @@
 
 # Run the integration test.
 
-set -e
-
-source $(dirname $0)/common.sh
+source $(dirname "${BASH_SOURCE}")/common.sh
 
 kube::build::verify_prereqs
 kube::build::build_image

diff --git a/build/run-tests.sh b/build/run-tests.sh
@@ -16,9 +16,7 @@
 
 # Run all of the golang unit tests.
 
-set -e
-
-source $(dirname $0)/common.sh
+source $(dirname "${BASH_SOURCE}")/common.sh
 
 kube::build::verify_prereqs
 kube::build::build_image

diff --git a/build/shell.sh b/build/shell.sh
@@ -18,9 +18,7 @@
 #
 # This container will have a snapshot of the current sources.
 
-set -e
-
-source $(dirname $0)/common.sh
+source $(dirname "${BASH_SOURCE}")/common.sh
 
 kube::build::verify_prereqs
 kube::build::build_image