LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

[scripts] lint-whitespace: use perl instead of grep -P

Browse source 
MacOS does not support 'grep -P' out of the box. This change makes
it easier for developers to check for whitespace problems locally.
This commit is contained in:
Sjors Provoost 2018-01-05 14:40:46 +01:00
parent 56910285fa
commit 40b17f5f91
No known key found for this signature in database
GPG key ID: 57FF9BDBCC301009
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
contrib/devtools/lint-whitespace.sh
View file

@ -59,7 +59,7 @@ if showdiff | grep -E -q '^\+.*\s+$'; then
fi fi
# Check if tab characters were found in the diff. # Check if tab characters were found in the diff.
if showcodediff | grep -P -q '^\+.*\t'; then if showcodediff | perl -nle '$MATCH++ if m{^\+.*\t}; END{exit 1 unless $MATCH>0}' > /dev/null; then
echo "This diff appears to have added new lines with tab characters instead of spaces." echo "This diff appears to have added new lines with tab characters instead of spaces."
echo "The following changes were suspected:" echo "The following changes were suspected:"
FILENAME="" FILENAME=""
@ -81,7 +81,7 @@ if showcodediff | grep -P -q '^\+.*\t'; then
fi fi
echo "$line" echo "$line"
fi fi
done < <(showcodediff | grep -P '^(diff --git |@@|\+.*\t)') done < <(showcodediff | perl -nle 'print if m{^(diff --git |@@|\+.*\t)}')
RET=1 RET=1
fi fi