Skip to content

Commit

Permalink
build: Use POSIX sh for shell scripts
Browse files Browse the repository at this point in the history
The scripts didn't really use any bash specific features. Convert
them to POSIX shell scripts, so that the plugins can be built without
requiring bash.

Signed-off-by: Tom Wieczorek <[email protected]>
  • Loading branch information
twz123 committed Sep 29, 2023
1 parent f955052 commit 853b82d
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions build_linux.sh
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion build_windows.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/usr/bin/env sh
set -e
cd "$(dirname "$0")"

Expand Down
2 changes: 1 addition & 1 deletion scripts/release.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/usr/bin/env sh
set -xe

SRC_DIR="${SRC_DIR:-$PWD}"
Expand Down
8 changes: 4 additions & 4 deletions test_linux.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/usr/bin/env sh
#
# Run CNI plugin tests.
#
Expand All @@ -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:-""}
Expand Down
4 changes: 2 additions & 2 deletions test_windows.sh
Original file line number Diff line number Diff line change
@@ -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"

Expand Down

0 comments on commit 853b82d

Please sign in to comment.