diff options
| author | Yin Ding <dingyin@gmail.com> | 2020-07-24 16:46:21 -0700 |
|---|---|---|
| committer | Yin Ding <dingyin@gmail.com> | 2020-07-30 18:32:15 -0700 |
| commit | bc4894f0a5d8e693a1853c8725a3a637421e68c6 (patch) | |
| tree | 73dfed23fa69c24757ceeadbd49fbd4ad27b4184 /hack/lib/lint.sh | |
| parent | Merge pull request #2010 from daixiang0/kill (diff) | |
| download | kubeedge-bc4894f0a5d8e693a1853c8725a3a637421e68c6.tar.gz | |
make lint work in Mac and fix lint issues
Diffstat (limited to 'hack/lib/lint.sh')
| -rw-r--r-- | hack/lib/lint.sh | 36 |
1 files changed, 34 insertions, 2 deletions
diff --git a/hack/lib/lint.sh b/hack/lib/lint.sh index bcf8ef47e..90e05cdb7 100644 --- a/hack/lib/lint.sh +++ b/hack/lib/lint.sh @@ -20,13 +20,45 @@ set -o errexit set -o nounset set -o pipefail +SED_CMD="" + +if [[ "$OSTYPE" == "darwin"* ]] +then + SED_CMD=`which gsed` + if [ -z $SED_CMD ] + 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 ] + then + echo "Please install sed" + exit 1 + fi +else + echo "Unsupported OS $OSTYPE" + exit 1 +fi + kubeedge::lint::check() { cd ${KUBEEDGE_ROOT} echo "start lint ..." set +o pipefail echo "check any whitenoise ..." # skip deleted files - git diff --cached --name-only --diff-filter=ACRMTU master | grep -Ev "externalversions|fake|vendor|images|adopters" | xargs --no-run-if-empty sed -i 's/[ \t]*$//' + if [[ "$OSTYPE" == "darwin"* ]] + then + git diff --cached --name-only --diff-filter=ACRMTU master | grep -Ev "externalversions|fake|vendor|images|adopters" | xargs $SED_CMD -i 's/[ \t]*$//' + elif [[ "$OSTYPE" == "linux"* ]] + then + git diff --cached --name-only --diff-filter=ACRMTU master | grep -Ev "externalversions|fake|vendor|images|adopters" | xargs --no-run-if-empty $SED_CMD -i 's/[ \t]*$//' + else + echo "Unsupported OS $OSTYPE" + exit 1 + fi [[ $(git diff --name-only) ]] && { echo "Some files have white noise issue, please run \`make lint\` to slove this issue" @@ -35,7 +67,7 @@ kubeedge::lint::check() { set -o pipefail echo "check any issue by golangci-lint ..." - golangci-lint run -v + GOOS="linux" golangci-lint run -v # only check format issue under staging dir echo "check any issue under staging dir by gofmt ..." |
