From b1953baba28362c928d962f0729325d3293c4753 Mon Sep 17 00:00:00 2001 From: Kim BKC Carlbacker Date: Wed, 22 Jan 2014 02:21:56 +0100 Subject: [PATCH] This should make all bash-scripts run on pretty much any posix-system (with bash installed ofc...) Docker-DCO-1.1-Signed-off-by: Kim BKC Carlbacker (github: bkcsoft) --- contrib/mkimage-arch.sh | 2 +- contrib/mkimage-busybox.sh | 2 +- contrib/mkimage-debootstrap.sh | 2 +- contrib/mkimage-rinse.sh | 2 +- contrib/mkimage-unittest.sh | 2 +- hack/infrastructure/docker-ci/buildbot/setup.sh | 2 +- .../infrastructure/docker-ci/docker-coverage/coverage-docker.sh | 2 +- hack/infrastructure/docker-ci/docker-test/test_docker.sh | 2 +- hack/infrastructure/docker-ci/nightlyrelease/dockerbuild.sh | 2 +- .../docker-ci/registry-coverage/registry_coverage.sh | 2 +- hack/make.sh | 2 +- hack/release.sh | 2 +- hack/stats.sh | 2 +- hack/vendor.sh | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/contrib/mkimage-arch.sh b/contrib/mkimage-arch.sh index db14e8674e1f9..55c6fe8e25c84 100755 --- a/contrib/mkimage-arch.sh +++ b/contrib/mkimage-arch.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Generate a minimal filesystem for archlinux and load it into the local # docker as "archlinux" # requires root diff --git a/contrib/mkimage-busybox.sh b/contrib/mkimage-busybox.sh index 7eed0c800cdd7..c1bb88c350ca9 100755 --- a/contrib/mkimage-busybox.sh +++ b/contrib/mkimage-busybox.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Generate a very minimal filesystem based on busybox-static, # and load it into the local docker under the name "busybox". diff --git a/contrib/mkimage-debootstrap.sh b/contrib/mkimage-debootstrap.sh index 3f268b52daddd..8564aaee2fa90 100755 --- a/contrib/mkimage-debootstrap.sh +++ b/contrib/mkimage-debootstrap.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e variant='minbase' diff --git a/contrib/mkimage-rinse.sh b/contrib/mkimage-rinse.sh index ff8f173f98f8e..de9265d48c031 100755 --- a/contrib/mkimage-rinse.sh +++ b/contrib/mkimage-rinse.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e repo="$1" diff --git a/contrib/mkimage-unittest.sh b/contrib/mkimage-unittest.sh index af6488e9b704d..a33f23884512b 100755 --- a/contrib/mkimage-unittest.sh +++ b/contrib/mkimage-unittest.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Generate a very minimal filesystem based on busybox-static, # and load it into the local docker under the name "docker-ut". diff --git a/hack/infrastructure/docker-ci/buildbot/setup.sh b/hack/infrastructure/docker-ci/buildbot/setup.sh index c7e89c44b2336..c5d9cb988e565 100755 --- a/hack/infrastructure/docker-ci/buildbot/setup.sh +++ b/hack/infrastructure/docker-ci/buildbot/setup.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Setup of buildbot configuration. Package installation is being done by # Vagrantfile diff --git a/hack/infrastructure/docker-ci/docker-coverage/coverage-docker.sh b/hack/infrastructure/docker-ci/docker-coverage/coverage-docker.sh index f03243cf8f018..c29ede5b814d8 100755 --- a/hack/infrastructure/docker-ci/docker-coverage/coverage-docker.sh +++ b/hack/infrastructure/docker-ci/docker-coverage/coverage-docker.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -x # Generate a random string of $1 characters diff --git a/hack/infrastructure/docker-ci/docker-test/test_docker.sh b/hack/infrastructure/docker-ci/docker-test/test_docker.sh index cf8fdb90bb509..14816706eda92 100755 --- a/hack/infrastructure/docker-ci/docker-test/test_docker.sh +++ b/hack/infrastructure/docker-ci/docker-test/test_docker.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -x COMMIT=${1-HEAD} diff --git a/hack/infrastructure/docker-ci/nightlyrelease/dockerbuild.sh b/hack/infrastructure/docker-ci/nightlyrelease/dockerbuild.sh index 80caaec25ea96..d5e58da7e1c01 100644 --- a/hack/infrastructure/docker-ci/nightlyrelease/dockerbuild.sh +++ b/hack/infrastructure/docker-ci/nightlyrelease/dockerbuild.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Variables AWS_ACCESS_KEY, AWS_SECRET_KEY and PG_PASSPHRASE are decoded # from /root/release_credentials.json diff --git a/hack/infrastructure/docker-ci/registry-coverage/registry_coverage.sh b/hack/infrastructure/docker-ci/registry-coverage/registry_coverage.sh index e16cea8e3ce43..c67b17eba05b5 100755 --- a/hack/infrastructure/docker-ci/registry-coverage/registry_coverage.sh +++ b/hack/infrastructure/docker-ci/registry-coverage/registry_coverage.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -x diff --git a/hack/make.sh b/hack/make.sh index fe0f9c175f57e..6029c9ec10d73 100755 --- a/hack/make.sh +++ b/hack/make.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e # This script builds various binary artifacts from a checkout of the docker diff --git a/hack/release.sh b/hack/release.sh index 729f1b5eff06f..9a38d2b6e9c92 100755 --- a/hack/release.sh +++ b/hack/release.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e # This script looks for bundles built by make.sh, and releases them on a diff --git a/hack/stats.sh b/hack/stats.sh index 2053e583a2610..985a77f22dcbf 100755 --- a/hack/stats.sh +++ b/hack/stats.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ## Run this script from the root of the docker repository ## to query project stats useful to the maintainers. diff --git a/hack/vendor.sh b/hack/vendor.sh index 3326d5b004595..d3e7ea9f43ec2 100755 --- a/hack/vendor.sh +++ b/hack/vendor.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e cd "$(dirname "$BASH_SOURCE")/.."