Merge pull request #30983 from tianon/usr-bin-env-bash

Convert script shebangs from "#!/bin/bash" to "#!/usr/bin/env bash"

contrib/builder/deb/aarch64/build.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"

contrib/builder/deb/aarch64/generate.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 # This file is used to auto-generate Dockerfiles for making debs via 'make deb'

contrib/builder/deb/amd64/build.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"

contrib/builder/deb/amd64/generate.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 # usage: ./generate.sh [versions]

contrib/builder/deb/armhf/generate.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 # usage: ./generate.sh [versions]

contrib/builder/deb/ppc64le/build.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e 
 
 cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"

contrib/builder/deb/ppc64le/generate.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 # This file is used to auto-generate Dockerfiles for making debs via 'make deb'

contrib/builder/deb/s390x/build.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"

contrib/builder/deb/s390x/generate.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 # This file is used to auto-generate Dockerfiles for making debs via 'make deb'

contrib/builder/rpm/amd64/build.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"

contrib/builder/rpm/amd64/generate.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 # usage: ./generate.sh [versions]

contrib/builder/rpm/armhf/build.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"

contrib/builder/rpm/armhf/generate.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # vim: set ts=4 sw=4 noet :
 
 set -e

contrib/builder/rpm/ppc64le/build.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"

contrib/builder/rpm/ppc64le/generate.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 # usage: ./generate.sh [versions]

contrib/completion/bash/docker

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # bash completion file for core docker commands
 #

contrib/docker-machine-install-bundle.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # This script installs the bundle to Docker Machine instances, for the purpose
 # of testing the latest Docker with Swarm mode enabled.

contrib/download-frozen-image-v1.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 # hello-world                      latest              ef872312fe1b        3 months ago        910 B

contrib/download-frozen-image-v2.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -eo pipefail
 
 # hello-world                      latest              ef872312fe1b        3 months ago        910 B

contrib/gitdm/generate_aliases.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #
 # This script generates a gitdm compatible email aliases file from a git

contrib/nuke-graph-directory.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 dir="$1"

contrib/reprepro/suites.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 cd "$(dirname "$BASH_SOURCE")/../.."

docs/reference/builder.md

@@ -1029,7 +1029,7 @@ the final executable receives the Unix signals by using `exec` and `gosu`
 commands:
 
 ```bash
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 if [ "$1" = 'postgres' ]; then

hack/dind

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 # DinD: a wrapper script which allows docker to be run inside a docker container.

hack/generate-authors.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 cd "$(dirname "$(readlink -f "$BASH_SOURCE")")/.."

hack/make/.binary

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 BINARY_NAME="$BINARY_SHORT_NAME-$VERSION"

hack/make/.binary-setup

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 DOCKER_CLIENT_BINARY_NAME='docker'
 DOCKER_DAEMON_BINARY_NAME='dockerd'

hack/make/.detect-daemon-osarch

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 docker-version-osarch() {

hack/make/.ensure-emptyfs

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 if ! docker inspect -t image emptyfs &> /dev/null; then

hack/make/.go-autogen

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 rm -rf autogen
 

hack/make/.integration-daemon-setup

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 bundle .detect-daemon-osarch

hack/make/.integration-daemon-start

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # see test-integration-cli for example usage of this script
 

hack/make/.integration-daemon-stop

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 if [ ! "$(go env GOOS)" = 'windows' ]; then
 	trap - EXIT # reset EXIT trap applied in .integration-daemon-start

hack/make/.integration-test-helpers

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 : ${TEST_REPEAT:=0}
 

hack/make/binary

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 rm -rf "$DEST"
 

hack/make/binary-client

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 [ -z "$KEEPDEST" ] && \

hack/make/binary-daemon

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 [ -z "$KEEPDEST" ] && \

hack/make/build-deb

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 # subshell so that we can export PATH and TZ without breaking other things

hack/make/build-integration-test-binary

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 rm -rf "$DEST"

hack/make/build-rpm

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 # subshell so that we can export PATH and TZ without breaking other things

hack/make/clean-apt-repo

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 # This script cleans the experimental pool for the apt repo.

hack/make/clean-yum-repo

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 # This script cleans the experimental pool for the yum repo.

hack/make/cover

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 bundle_cover() {

hack/make/cross

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 # explicit list of os/arch combos that support being a daemon

hack/make/dynbinary

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 # This script exists as backwards compatibility for CI

hack/make/dynbinary-client

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 (

hack/make/dynbinary-daemon

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 (

hack/make/generate-index-listing

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 # This script generates index files for the directory structure

hack/make/install-binary

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 rm -rf "$DEST"

hack/make/install-binary-client

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 rm -rf "$DEST"

hack/make/install-binary-daemon

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 rm -rf "$DEST"

hack/make/install-script

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 # This script modifies the install.sh script for domains and keys other than

hack/make/release-deb

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 # This script creates the apt repos for the .deb files generated by hack/make/build-deb

hack/make/release-rpm

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 # This script creates the yum repos for the .rpm files generated by hack/make/build-rpm

hack/make/run

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 rm -rf "$DEST"

hack/make/sign-repos

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # This script signs the deliverables from release-deb and release-rpm
 # with a designated GPG key.

hack/make/test-deb-install

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # This script is used for testing install.sh and that it works for
 # each of component of our apt and yum repos
 set -e

hack/make/test-docker-py

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 source hack/make/.integration-test-helpers

hack/make/test-install-script

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # This script is used for testing install.sh and that it works for
 # each of component of our apt and yum repos
 set -e

hack/make/test-integration-cli

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 source hack/make/.integration-test-helpers

hack/make/test-integration-shell

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 bundle .integration-daemon-start
 bundle .integration-daemon-setup

hack/make/test-old-apt-repo

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 versions=( 1.3.3 1.4.1 1.5.0 1.6.2 )

hack/make/test-unit

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 # Run Docker's test suite, including sub-packages, and store their output as a bundle

hack/make/tgz

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 CROSS="$DEST/../cross"
 

hack/make/ubuntu

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 PKGVERSION="${VERSION//-/'~'}"
 # if we have a "-dev" suffix or have change in Git, let's make this package version more complex so it works better

hack/make/update-apt-repo

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 # This script updates the apt repo in $DOCKER_RELEASE_DIR/apt/repo.

hack/make/win

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 # explicit list of os/arch combos that support being a daemon

hack/validate/.validate

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e -o pipefail
 

hack/validate/all

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Run all validation
 

hack/validate/changelog-date-descending

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 changelogFile=${1:-CHANGELOG.md}
 

hack/validate/changelog-well-formed

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 changelogFile=${1:-CHANGELOG.md}
 

hack/validate/compose-bindata

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 source "${SCRIPTDIR}/.validate"

hack/validate/dco

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 source "${SCRIPTDIR}/.validate"

hack/validate/default

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Run default validation, exclude vendor because it's slow
 

hack/validate/default-seccomp

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 source "${SCRIPTDIR}/.validate"

hack/validate/gofmt

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 source "${SCRIPTDIR}/.validate"

hack/validate/lint

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 source "${SCRIPTDIR}/.validate"

hack/validate/pkg-imports

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

hack/validate/swagger

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 source "${SCRIPTDIR}/.validate"

hack/validate/swagger-gen

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 source "${SCRIPTDIR}/.validate"

hack/validate/test-imports

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Make sure we're not using gos' Testing package any more in integration-cli
 
 export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

hack/validate/toml

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 source "${SCRIPTDIR}/.validate"

hack/validate/vendor

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 source "${SCRIPTDIR}/.validate"

hack/validate/vet

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 source "${SCRIPTDIR}/.validate"

hack/vendor.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # This file is just wrapper around vndr (github.com/LK4D4/vndr) tool.
 # For updating dependencies you should change `vendor.conf` file in root of the

integration-cli/fixtures/auth/docker-credential-shell-test

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 

man/generate.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Generate man pages for docker/docker
 #

man/md2man-all.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 # get into this script's directory