diff --git a/build_linux.sh b/build_linux.sh index 6f8340b55..b6d054e7c 100755 --- a/build_linux.sh +++ b/build_linux.sh @@ -1,8 +1,8 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh set -e cd "$(dirname "$0")" -if [ "$(uname)" == "Darwin" ]; then +if [ "$(uname)" = "Darwin" ]; then export GOOS="${GOOS:-linux}" fi diff --git a/build_windows.sh b/build_windows.sh index d71cf6868..895909a5e 100755 --- a/build_windows.sh +++ b/build_windows.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh set -e cd "$(dirname "$0")" diff --git a/scripts/release.sh b/scripts/release.sh index 5002428ed..2b92d28a8 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh set -xe SRC_DIR="${SRC_DIR:-$PWD}" diff --git a/test_linux.sh b/test_linux.sh index 9b29d74f6..fd320d101 100755 --- a/test_linux.sh +++ b/test_linux.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh # # Run CNI plugin tests. # @@ -10,12 +10,12 @@ set -e cd "$(dirname "$0")" # Build all plugins before testing -source ./build_linux.sh +. ./build_linux.sh echo "Running tests" -function testrun { - sudo -E bash -c "umask 0; PATH=${GOPATH}/bin:$(pwd)/bin:${PATH} go test -race $@" +testrun() { + sudo -E sh -c "umask 0; PATH=${GOPATH}/bin:$(pwd)/bin:${PATH} go test -race $*" } COVERALLS=${COVERALLS:-""} diff --git a/test_windows.sh b/test_windows.sh index b74fb5700..22c2352a7 100755 --- a/test_windows.sh +++ b/test_windows.sh @@ -1,11 +1,11 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh # # Run CNI plugin tests. # set -e cd "$(dirname "$0")" -source ./build_windows.sh +. ./build_windows.sh echo "Running tests"