From 4b444923145dd10e5010464838d3f809a36c28e0 Mon Sep 17 00:00:00 2001 From: Ruben Vereecken Date: Tue, 14 Apr 2015 22:15:00 +0200 Subject: [PATCH] Added make lint-changed which lints changed files only. --- Makefile | 8 ++++++-- scripts/lint-changed.sh | 6 ++++++ scripts/pre-commit | 1 + 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100755 scripts/lint-changed.sh diff --git a/Makefile b/Makefile index 783f691aeb..4363c4e492 100644 --- a/Makefile +++ b/Makefile @@ -7,8 +7,12 @@ setup: @chmod +x .git/hooks/pre-commit @echo "Git pre-commit hook installed." - @gem install mdl --install-dir .gem + @gem install mdl --install-dir .gem --no-rdoc --no-ri @echo "Installed required Ruby gems under .gem" lint: - @GEM_PATH=.gem PATH=$(PATH):.gem/bin find pages -exec mdl {} --style ./scripts/markdown-style.rb 1>&2 \; + @GEM_PATH=.gem find pages -exec .gem/bin/mdl {} --style ./scripts/markdown-style.rb 1>&2 \; + +lint-changed: + @./scripts/lint-changed.sh + diff --git a/scripts/lint-changed.sh b/scripts/lint-changed.sh new file mode 100755 index 0000000000..022cee27f4 --- /dev/null +++ b/scripts/lint-changed.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +MD_FILES=`git diff --cached --name-only | tr " " "\n" | egrep ^.*\.md$` + +# Execute Markdown lint if any markdown files have been changed and added to git +[[ -z "$MD_FILES" ]] || GEM_PATH=.gem .gem/bin/mdl "$MD_FILES" diff --git a/scripts/pre-commit b/scripts/pre-commit index 3869d9028f..c5d8e6ee05 100644 --- a/scripts/pre-commit +++ b/scripts/pre-commit @@ -2,3 +2,4 @@ make index git add ./pages/index.json +make lint-changed