From a57fd481bc8ff02db7669a1080b7440cd8f17700 Mon Sep 17 00:00:00 2001 From: Joel R Cooklin Date: Tue, 14 Feb 2017 14:46:48 -0800 Subject: [PATCH] Adds '/usr/bin/env bash' for portability --- scripts/build_plugin.sh | 2 +- scripts/build_plugins.sh | 2 +- scripts/build_snap.sh | 2 +- scripts/common.sh | 2 +- scripts/deps.sh | 2 +- scripts/gen-proto.sh | 4 +++- scripts/pre_deploy.sh | 2 +- scripts/run_tests_with_docker.sh | 2 +- scripts/test.sh | 2 +- 9 files changed, 11 insertions(+), 9 deletions(-) diff --git a/scripts/build_plugin.sh b/scripts/build_plugin.sh index 7838ec0d9..78977b6bf 100755 --- a/scripts/build_plugin.sh +++ b/scripts/build_plugin.sh @@ -1,4 +1,4 @@ -#!/bin/bash -e +#!/usr/bin/env bash #http://www.apache.org/licenses/LICENSE-2.0.txt # diff --git a/scripts/build_plugins.sh b/scripts/build_plugins.sh index d6411845b..39d91040a 100755 --- a/scripts/build_plugins.sh +++ b/scripts/build_plugins.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash #http://www.apache.org/licenses/LICENSE-2.0.txt # diff --git a/scripts/build_snap.sh b/scripts/build_snap.sh index 11d275130..9e257abe6 100755 --- a/scripts/build_snap.sh +++ b/scripts/build_snap.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash #http://www.apache.org/licenses/LICENSE-2.0.txt # diff --git a/scripts/common.sh b/scripts/common.sh index d989a1be1..c14e7dfc0 100644 --- a/scripts/common.sh +++ b/scripts/common.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e set -u diff --git a/scripts/deps.sh b/scripts/deps.sh index 40645885d..ab575ba45 100755 --- a/scripts/deps.sh +++ b/scripts/deps.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash #http://www.apache.org/licenses/LICENSE-2.0.txt # diff --git a/scripts/gen-proto.sh b/scripts/gen-proto.sh index 939217ee6..6b0bb5f9d 100755 --- a/scripts/gen-proto.sh +++ b/scripts/gen-proto.sh @@ -1,4 +1,4 @@ -#!/bin/bash -e +#!/usr/bin/env bash #http://www.apache.org/licenses/LICENSE-2.0.txt # @@ -17,6 +17,8 @@ #See the License for the specific language governing permissions and #limitations under the License. +set -e + echo "Checking for proto" if ! which protoc > /dev/null then diff --git a/scripts/pre_deploy.sh b/scripts/pre_deploy.sh index 0958689da..c06c3c86d 100755 --- a/scripts/pre_deploy.sh +++ b/scripts/pre_deploy.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # File managed by pluginsync # http://www.apache.org/licenses/LICENSE-2.0.txt diff --git a/scripts/run_tests_with_docker.sh b/scripts/run_tests_with_docker.sh index 351e3918c..c6ca7ccb2 100755 --- a/scripts/run_tests_with_docker.sh +++ b/scripts/run_tests_with_docker.sh @@ -1,4 +1,4 @@ -#!/bin/bash -e +#!/usr/bin/env bash #http://www.apache.org/licenses/LICENSE-2.0.txt # diff --git a/scripts/test.sh b/scripts/test.sh index 416479353..417104a62 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash #http://www.apache.org/licenses/LICENSE-2.0.txt #