diff options
| author | chriseth <chris@ethereum.org> | 2018-12-03 22:48:03 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-03 22:48:03 +0800 |
| commit | c8a2cb62832afb2dc09ccee6fd42c1516dfdb981 (patch) | |
| tree | 7977e9dcbbc215088c05b847f849871ef5d4ae66 /scripts/check_style.sh | |
| parent | 1d4f565a64988a3400847d2655ca24f73f234bc6 (diff) | |
| parent | 590be1d84cea9850ce69b68be3dc5294b39041e5 (diff) | |
| download | dexon-solidity-c8a2cb62832afb2dc09ccee6fd42c1516dfdb981.tar dexon-solidity-c8a2cb62832afb2dc09ccee6fd42c1516dfdb981.tar.gz dexon-solidity-c8a2cb62832afb2dc09ccee6fd42c1516dfdb981.tar.bz2 dexon-solidity-c8a2cb62832afb2dc09ccee6fd42c1516dfdb981.tar.lz dexon-solidity-c8a2cb62832afb2dc09ccee6fd42c1516dfdb981.tar.xz dexon-solidity-c8a2cb62832afb2dc09ccee6fd42c1516dfdb981.tar.zst dexon-solidity-c8a2cb62832afb2dc09ccee6fd42c1516dfdb981.zip | |
Merge pull request #5571 from ethereum/develop
Version 0.5.1
Diffstat (limited to 'scripts/check_style.sh')
| -rwxr-xr-x | scripts/check_style.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/scripts/check_style.sh b/scripts/check_style.sh index 4f716d66..171867f9 100755 --- a/scripts/check_style.sh +++ b/scripts/check_style.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +. scripts/report_errors.sh + ( REPO_ROOT="$(dirname "$0")"/.. cd $REPO_ROOT @@ -8,8 +10,8 @@ WHITESPACE=$(git grep -n -I -E "^.*[[:space:]]+$" | grep -v "test/libsolidity/AS if [[ "$WHITESPACE" != "" ]] then - echo "Error: Trailing whitespace found:" >&2 - echo "$WHITESPACE" >&2 + echo "Error: Trailing whitespace found:" | tee -a $ERROR_LOG + echo "$WHITESPACE" | tee -a $ERROR_LOG exit 1 fi @@ -22,8 +24,8 @@ git grep -nIE "\<if\>\s*\(.*\)\s*\{\s*$" -- '*.h' '*.cpp' if [[ "$FORMATERROR" != "" ]] then - echo "Error: Format error for if/for:" >&2 - echo "$FORMATERROR" >&2 + echo "Error: Format error for if/for:" | tee -a $ERROR_LOG + echo "$FORMATERROR" | tee -a $ERROR_LOG exit 1 fi ) |