RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-18 12:52:44 +01:00
Code Releases Activity

whitespacecheck: Resolve most of the shellcheck sh issues

Browse Source
This commit is contained in:
Koen Zandberg 2020-10-30 15:46:43 +01:00
parent 9e4dd8e451
commit 2fff75017b
No known key found for this signature in database
GPG Key ID: 0895A893E6D2985B
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dist/tools/whitespacecheck/check.sh vendored
View File

@ -6,13 +6,13 @@
# General Public License v2.1. See the file LICENSE in the top level
# directory for more details.
IGNORE=`awk '{ printf ":!%s ", $0 }' $(dirname "$0")/ignore_list.txt`
IGNORE=$(awk '{ printf ":!%s ", $0 }' "$(dirname "$0")/ignore_list.txt")
# If no branch but an option is given, unset BRANCH.
# Otherwise, consume this parameter.
BRANCH="${1}"
if echo "${BRANCH}" | grep -q '^-'; then
if [ $(git rev-parse --abbrev-ref HEAD) != "master" ]; then
if [ "$(git rev-parse --abbrev-ref HEAD)" != "master" ]; then
BRANCH="master"
else
BRANCH=""
@ -30,15 +30,18 @@ if [ -z "${BRANCH}" ]; then
fi
git -c core.whitespace="tab-in-indent,tabwidth=4" \
diff --check $(git merge-base ${BRANCH} HEAD) -- *.[ch] ${IGNORE}
diff --check "$(git merge-base "${BRANCH}" HEAD)" -- *.[ch] ${IGNORE}
RESULT=$?
# Git regards any trailing white space except `\n` as an error so `\r` is
# checked here, too
git -c core.whitespace="trailing-space" \
diff --check $(git merge-base ${BRANCH} HEAD) -- . ${IGNORE}
if [ $? -ne 0 ] || [ $RESULT -ne 0 ]
diff --check "$(git merge-base "${BRANCH}" HEAD)" -- . ${IGNORE}
TRAILING_RESULT=$?
if [ ${TRAILING_RESULT} -ne 0 ] || [ ${RESULT} -ne 0 ]
then
echo "ERROR: This change introduces new whitespace errors"
exit 1