From 57e0245b1b3121cf9e52a3a778361a7652914a2b Mon Sep 17 00:00:00 2001 From: Filip Bucek Date: Fri, 8 Nov 2019 11:14:59 +0100 Subject: [PATCH 1/2] fixing check script for lineendings --- .gitlab-ci.yml | 1 - scripts/check.sh | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 093af4b..a101602 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,6 @@ stages: - build - test -- quality # ######## # Build diff --git a/scripts/check.sh b/scripts/check.sh index 2f5dc1d..646d1e1 100755 --- a/scripts/check.sh +++ b/scripts/check.sh @@ -10,7 +10,7 @@ cd $SOURCE_DIR info "Checking line ending" -RESULT=$( find . -not -type d -exec file "{}" ";" | grep "ASCII text, with CRLF" | cat) +RESULT=$( find . -not -type d ! -path '.git' -exec file "{}" ";" | grep "ASCII text, with CRLF" | cat ) if [ ! -z "$RESULT" ]; then echo "----------------------------------" From b6950b9bfe35d10d4fc65e42f22086796ac85142 Mon Sep 17 00:00:00 2001 From: Filip Bucek Date: Fri, 8 Nov 2019 11:26:09 +0100 Subject: [PATCH 2/2] fix lineending checks for .git --- scripts/check.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/check.sh b/scripts/check.sh index 646d1e1..7ed9d62 100755 --- a/scripts/check.sh +++ b/scripts/check.sh @@ -10,7 +10,7 @@ cd $SOURCE_DIR info "Checking line ending" -RESULT=$( find . -not -type d ! -path '.git' -exec file "{}" ";" | grep "ASCII text, with CRLF" | cat ) +RESULT=$( find . -not -type d ! -path '*.git/*' -exec file "{}" ";" | grep "ASCII text, with CRLF" | cat ) if [ ! -z "$RESULT" ]; then echo "----------------------------------"