From 8523fe641691a08a0e82e8d2b301069b574b876f Mon Sep 17 00:00:00 2001 From: Fabian Fett Date: Thu, 21 Jan 2021 19:31:40 +0100 Subject: [PATCH] Use welcoming language --- docker/docker-compose.yaml | 4 ++-- scripts/{sanity.sh => soundness.sh} | 18 +++++++++++++++++- 2 files changed, 19 insertions(+), 3 deletions(-) rename scripts/{sanity.sh => soundness.sh} (88%) diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml index f3996271..7feae683 100644 --- a/docker/docker-compose.yaml +++ b/docker/docker-compose.yaml @@ -22,9 +22,9 @@ services: - CAP_NET_RAW - CAP_NET_BIND_SERVICE - sanity: + soundness: <<: *common - command: /bin/bash -cl "./scripts/sanity.sh" + command: /bin/bash -cl "./scripts/soundness.sh" test: <<: *common diff --git a/scripts/sanity.sh b/scripts/soundness.sh similarity index 88% rename from scripts/sanity.sh rename to scripts/soundness.sh index d0a66939..51c5d3d0 100755 --- a/scripts/sanity.sh +++ b/scripts/soundness.sh @@ -22,6 +22,22 @@ function replace_acceptable_years() { sed -e 's/2017-2018/YEARS/' -e 's/2017-2020/YEARS/' -e 's/2019/YEARS/' -e 's/2020/YEARS/' } +printf "=> Checking for unacceptable language... " +# This greps for unacceptable terminology. The square bracket[s] are so that +# "git grep" doesn't find the lines that greps :). +unacceptable_terms=( + -e blacklis[t] + -e whitelis[t] + -e slav[e] + -e sanit[y] +) +if git grep --color=never -i "${unacceptable_terms[@]}" > /dev/null; then + printf "\033[0;31mUnacceptable language found.\033[0m\n" + git grep -i "${unacceptable_terms[@]}" + exit 1 +fi +printf "\033[0;32mokay.\033[0m\n" + printf "=> Checking format... " FIRST_OUT="$(git status --porcelain)" swiftformat . > /dev/null 2>&1 @@ -35,7 +51,7 @@ else fi printf "=> Checking license headers\n" -tmp=$(mktemp /tmp/.swift-aws-lambda-sanity_XXXXXX) +tmp=$(mktemp /tmp/.swift-aws-lambda-soundness_XXXXXX) for language in swift-or-c bash dtrace; do printf " * $language... "