From 5cfc9c374cbde2fa650ee069d039cd6efeae0197 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 26 Aug 2022 16:08:14 +0200 Subject: [PATCH] validate: address SC2155 (shellcheck) see https://github.com/koalaman/shellcheck/wiki/SC2155 Looking at how these were used, I don't think we even need to export them, so removing that. Signed-off-by: Sebastiaan van Stijn --- hack/validate/all | 2 +- hack/validate/dco | 2 +- hack/validate/default | 2 +- hack/validate/default-seccomp | 2 +- hack/validate/deprecate-integration-cli | 2 +- hack/validate/pkg-imports | 2 +- hack/validate/swagger | 2 +- hack/validate/swagger-gen | 2 +- hack/validate/toml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/hack/validate/all b/hack/validate/all index 3224fe57c2..281684af0d 100755 --- a/hack/validate/all +++ b/hack/validate/all @@ -2,7 +2,7 @@ # # Run all validation -export SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" . ${SCRIPTDIR}/default . ${SCRIPTDIR}/vendor diff --git a/hack/validate/dco b/hack/validate/dco index 0e61ccca5d..6354d2b57f 100755 --- a/hack/validate/dco +++ b/hack/validate/dco @@ -1,6 +1,6 @@ #!/usr/bin/env bash -export SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" source "${SCRIPTDIR}/.validate" adds=$(validate_diff --numstat | awk '{ s += $1 } END { print s }') diff --git a/hack/validate/default b/hack/validate/default index b48d9fa09c..bb531770d1 100755 --- a/hack/validate/default +++ b/hack/validate/default @@ -2,7 +2,7 @@ # # Run default validation, exclude vendor because it's slow -export SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" # Skip DCO check here, as it's already checked in a separate stage in the Jenkinsfile #. "${SCRIPTDIR}"/dco diff --git a/hack/validate/default-seccomp b/hack/validate/default-seccomp index c5f8c7e3c8..aea27d12af 100755 --- a/hack/validate/default-seccomp +++ b/hack/validate/default-seccomp @@ -1,6 +1,6 @@ #!/usr/bin/env bash -export SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" source "${SCRIPTDIR}/.validate" IFS=$'\n' diff --git a/hack/validate/deprecate-integration-cli b/hack/validate/deprecate-integration-cli index f53b48eedc..f7b273c9f7 100755 --- a/hack/validate/deprecate-integration-cli +++ b/hack/validate/deprecate-integration-cli @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Check that no new tests are being added to integration-cli -export SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" source "${SCRIPTDIR}/.validate" new_tests=$( diff --git a/hack/validate/pkg-imports b/hack/validate/pkg-imports index bba762d99f..c8ba223f63 100755 --- a/hack/validate/pkg-imports +++ b/hack/validate/pkg-imports @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -e -export SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" source "${SCRIPTDIR}/.validate" IFS=$'\n' diff --git a/hack/validate/swagger b/hack/validate/swagger index 1ed8d3bcd1..5313221b7b 100755 --- a/hack/validate/swagger +++ b/hack/validate/swagger @@ -1,6 +1,6 @@ #!/usr/bin/env bash set -e -export SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" source "${SCRIPTDIR}/.validate" IFS=$'\n' diff --git a/hack/validate/swagger-gen b/hack/validate/swagger-gen index 0d000ea39b..40631703cd 100755 --- a/hack/validate/swagger-gen +++ b/hack/validate/swagger-gen @@ -1,6 +1,6 @@ #!/usr/bin/env bash -export SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" source "${SCRIPTDIR}/.validate" IFS=$'\n' diff --git a/hack/validate/toml b/hack/validate/toml index 7f1739ab84..fe86cac1a7 100755 --- a/hack/validate/toml +++ b/hack/validate/toml @@ -1,6 +1,6 @@ #!/usr/bin/env bash -export SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" source "${SCRIPTDIR}/.validate" IFS=$'\n'