From 65f81990a77a92baf1a858f6c3973ab1d4a7e670 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Fri, 21 Apr 2017 11:23:45 +0200 Subject: [PATCH] =?UTF-8?q?Update=20script=20to=20use=20/usr/bin/env=20bas?= =?UTF-8?q?h=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit … instead of /bin/bash, to work better on more platforms. Signed-off-by: Vincent Demeester --- script/.validate | 2 +- script/binary | 2 +- script/crossbinary | 2 +- script/deploy-docker.sh | 2 +- script/deploy.sh | 2 +- script/generate | 2 +- script/glide.sh | 2 +- script/test-integration | 2 +- script/test-unit | 2 +- script/validate-autogen | 4 ++-- script/validate-errcheck | 2 +- script/validate-glide | 2 +- script/validate-gofmt | 2 +- script/validate-golint | 2 +- script/validate-govet | 2 +- script/validate-misspell | 2 +- script/validate-vendor | 2 +- 17 files changed, 18 insertions(+), 18 deletions(-) diff --git a/script/.validate b/script/.validate index 4db554733..42b4cc70c 100644 --- a/script/.validate +++ b/script/.validate @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash if [ -z "${VALIDATE_UPSTREAM:-}" ]; then # this is kind of an expensive check, so let's not do this twice if we diff --git a/script/binary b/script/binary index 8ba7cbb71..685bbb0b7 100755 --- a/script/binary +++ b/script/binary @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e if ! test -e autogen/gen.go; then diff --git a/script/crossbinary b/script/crossbinary index ade28e8b5..7cd89a834 100755 --- a/script/crossbinary +++ b/script/crossbinary @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e if ! test -e autogen/gen.go; then diff --git a/script/deploy-docker.sh b/script/deploy-docker.sh index 4f54329cb..968bac43b 100644 --- a/script/deploy-docker.sh +++ b/script/deploy-docker.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e if [ -n "$TRAVIS_COMMIT" ]; then diff --git a/script/deploy.sh b/script/deploy.sh index 4ee707905..c04fcfa43 100755 --- a/script/deploy.sh +++ b/script/deploy.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e if [ -n "$TRAVIS_TAG" ] && [ "$DOCKER_VERSION" = "1.10.3" ]; then diff --git a/script/generate b/script/generate index 539075810..423970b5a 100755 --- a/script/generate +++ b/script/generate @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e go generate diff --git a/script/glide.sh b/script/glide.sh index ced07f71a..b8964efc6 100755 --- a/script/glide.sh +++ b/script/glide.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -o errexit set -o pipefail set -o nounset diff --git a/script/test-integration b/script/test-integration index b889fb446..42f5aca8f 100755 --- a/script/test-integration +++ b/script/test-integration @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" diff --git a/script/test-unit b/script/test-unit index 12521f578..4de9cd3f0 100755 --- a/script/test-unit +++ b/script/test-unit @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e if ! test -e autogen/gen.go; then diff --git a/script/validate-autogen b/script/validate-autogen index 52a6a7141..e251bf9e8 100755 --- a/script/validate-autogen +++ b/script/validate-autogen @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -o errexit set -o pipefail set -o nounset @@ -6,7 +6,7 @@ set -o nounset SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"; export SCRIPTDIR source "${SCRIPTDIR}/.validate" -# Iterate over all directories containing vendor folders. +# Iterate over all directories containing templates folders. IFS=$'\n' files=( $(validate_diff --diff-filter=ACMR --name-only -- templates || true) ) if [[ ${#files[@]} -gt 0 ]]; then diff --git a/script/validate-errcheck b/script/validate-errcheck index cfdad38f2..f7cefc61c 100755 --- a/script/validate-errcheck +++ b/script/validate-errcheck @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash source "$(dirname "$BASH_SOURCE")/.validate" diff --git a/script/validate-glide b/script/validate-glide index e65b13c48..d60629e56 100755 --- a/script/validate-glide +++ b/script/validate-glide @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash source "$(dirname "$BASH_SOURCE")/.validate" diff --git a/script/validate-gofmt b/script/validate-gofmt index 36ceb173b..f19f3d904 100755 --- a/script/validate-gofmt +++ b/script/validate-gofmt @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash source "$(dirname "$BASH_SOURCE")/.validate" diff --git a/script/validate-golint b/script/validate-golint index b17630e2d..45f103a41 100755 --- a/script/validate-golint +++ b/script/validate-golint @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash source "$(dirname "$BASH_SOURCE")/.validate" diff --git a/script/validate-govet b/script/validate-govet index 83dc0acf4..af4a6f56a 100755 --- a/script/validate-govet +++ b/script/validate-govet @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash source "$(dirname "$BASH_SOURCE")/.validate" diff --git a/script/validate-misspell b/script/validate-misspell index a52ed4e98..d3f1b375a 100755 --- a/script/validate-misspell +++ b/script/validate-misspell @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash source "$(dirname "$BASH_SOURCE")/.validate" diff --git a/script/validate-vendor b/script/validate-vendor index ad3dd90d7..d7a04b6bc 100755 --- a/script/validate-vendor +++ b/script/validate-vendor @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -o errexit set -o pipefail set -o nounset