summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Roth <martinr@coreboot.org>2018-09-02 18:45:43 -0600
committerPatrick Georgi <pgeorgi@google.com>2019-01-23 14:55:31 +0000
commit300b25a910330ea5d2df4758bb06e77cf81c87b3 (patch)
tree1f426a0778409c807c9da762a3e4fe8c8088cafb
parent6e44d7c4523ad29a5f7f25bb91160b5bbde9649c (diff)
downloadcoreboot-300b25a910330ea5d2df4758bb06e77cf81c87b3.tar.xz
util/lint: Update non-ascii linter for FreeBSD
On FreeBSD, this test was failing with the error: "grep: Argument list too long" - Remove support for testing coreboot not in a git repo. Many of the other linters already don't support this. - Use git grep to find offending files, then xargs to print out the lines. Change-Id: Ic017dc3465fd9a46ff4e6ec5ef16396e963483cd Signed-off-by: Martin Roth <martinr@coreboot.org> Reviewed-on: https://review.coreboot.org/c/28448 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
-rwxr-xr-xutil/lint/lint-stable-016-non-ascii26
1 files changed, 13 insertions, 13 deletions
diff --git a/util/lint/lint-stable-016-non-ascii b/util/lint/lint-stable-016-non-ascii
index beffd83dd6..3c229009ca 100755
--- a/util/lint/lint-stable-016-non-ascii
+++ b/util/lint/lint-stable-016-non-ascii
@@ -21,13 +21,11 @@ EXCLUDED_DIRS='^payloads/\|^src/vendorcode/\|^Documentation/\|^build/\|^3rdparty
EXCLUDED_FILES='to-wiki/towiki\.sh$\|vga/vga_font\|video/font\|PDCurses.*x11'
EXCLUDED_PHRASES='Copyright\|Ported to\|Intel®\|°C\|°F\|Athlon™\|Copyright.*©\|A-Za-zÀ-ÿ'
-# Use git ls-files if the code is in a git repo, otherwise use find.
-if [ -n "$(command -v git)" ] && \
- [ "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ]
+# Exit if git isn't present or the code isn't in a git repo
+if [ -z "$(command -v git)" ] || \
+ [ "$(git rev-parse --is-inside-work-tree 2>/dev/null)" != "true" ]
then
- FIND_FILES="git ls-files"
-else
- FIND_FILES="find . "
+ exit
fi
# 1. Get the list of files to parse and send them through grep
@@ -36,10 +34,12 @@ fi
# 3. Remove common phrases and names that have been found
# 4. Run the result through grep again to highlight the issues that were
# found. Without this step, the characters can be difficult to see.
-grep -n "[^ -~]" \
- $(${FIND_FILES} | sed 's|^\./||' | sort | \
- grep "$INCLUDED_FILES" | \
- grep -v "$EXCLUDED_DIRS" | \
- grep -v "$EXCLUDED_FILES") | \
- grep -iv "$EXCLUDED_PHRASES" | \
- grep --color='auto' "[^ -~]"
+# shellcheck disable=SC2046
+git grep -lP "[^\t-~]" | \
+ grep "$INCLUDED_FILES" | \
+ grep -v "$EXCLUDED_DIRS" | \
+ grep -v "$EXCLUDED_FILES" | \
+ xargs -I % \
+ grep -n "[^ -~]" % | \
+ grep -iv "$EXCLUDED_PHRASES" | \
+ grep --color='auto' "[^ -~]"