diff options
| author | KubeEdge Bot <48982446+kubeedge-bot@users.noreply.github.com> | 2022-01-18 17:06:25 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-18 17:06:25 +0800 |
| commit | 4c1b43fb363907afb3dd2c44c6ea180d5d755a65 (patch) | |
| tree | f6ad1e2ce7d638cdf06acc7ee4ad30bb21f0d2b7 /hack/lib | |
| parent | Merge pull request #3553 from fisherxu/verify-go (diff) | |
| parent | Wrap initialization operations in lint.sh into functions (diff) | |
| download | kubeedge-4c1b43fb363907afb3dd2c44c6ea180d5d755a65.tar.gz | |
Merge pull request #3563 from JooKS-me/fix-check-sed
Fix no prompt while executing `make all` without sed
Diffstat (limited to 'hack/lib')
| -rwxr-xr-x | hack/lib/lint.sh | 41 |
1 files changed, 23 insertions, 18 deletions
diff --git a/hack/lib/lint.sh b/hack/lib/lint.sh index af8f42451..639fcb177 100755 --- a/hack/lib/lint.sh +++ b/hack/lib/lint.sh @@ -20,31 +20,36 @@ set -o errexit set -o nounset set -o pipefail -SED_CMD="" -KUBEEDGE_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd -P)" +function kubeedge::lint::init() { + SED_CMD="" + KUBEEDGE_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd -P)" -if [[ "$OSTYPE" == "darwin"* ]] -then - SED_CMD=`which gsed` - if [ -z $SED_CMD ] + if [[ "$OSTYPE" == "darwin"* ]] then - echo "Please install gnu-sed (brew install gnu-sed)" - exit 1 - fi -elif [[ "$OSTYPE" == "linux"* ]] -then - SED_CMD=`which sed` - if [ -z $SED_CMD ] + if ! which gsed >/dev/null 2>&1 + then + echo "Please install gnu-sed (brew install gnu-sed)" + exit 1 + else + SED_CMD=`which gsed` + fi + elif [[ "$OSTYPE" == "linux"* ]] then - echo "Please install sed" + if ! which sed >/dev/null 2>&1 + then + echo "Please install sed" + exit 1 + else + SED_CMD=`which sed` + fi + else + echo "Unsupported OS $OSTYPE" exit 1 fi -else - echo "Unsupported OS $OSTYPE" - exit 1 -fi +} kubeedge::lint::check() { + kubeedge::lint::init cd ${KUBEEDGE_ROOT} echo "start lint ..." set +o pipefail |