From 8b075173e14769124d80f575c477949572feef7d Mon Sep 17 00:00:00 2001 From: Waldir Pimenta Date: Fri, 9 Oct 2015 08:54:24 +0100 Subject: [PATCH 1/4] mention lsb_release --- pages/common/uname.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pages/common/uname.md b/pages/common/uname.md index 4da2a53587..d27a4600cf 100644 --- a/pages/common/uname.md +++ b/pages/common/uname.md @@ -2,6 +2,8 @@ > Print details about the current machine and the operating system running on it +> Note: If you're on Linux, try also the `lsb_release` command. + - Print hardware-related information: machine and processor `uname -mp` From 5f968a6630d6277010ed45cceff0781d23718351 Mon Sep 17 00:00:00 2001 From: Igor Shubovych Date: Sun, 6 Dec 2015 18:36:44 +0200 Subject: [PATCH 2/4] Optimize make lint task --- .travis.yml | 2 +- Makefile | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9b41005dfd..d5387571b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ gemfile: - Gemfile script: -- make check +- make lint after_success: - bash scripts/build.sh diff --git a/Makefile b/Makefile index a778389c2b..ae83325c33 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -default: check +default: lint all: setup index @@ -17,13 +17,10 @@ deps: @bundle @echo "OK" -check: - @bundle exec mdl --style ./scripts/markdown-style.rb pages - lint: - @GEM_PATH=.gem find pages -exec mdl {} --style ./scripts/markdown-style.rb 1>&2 \; + @bundle exec mdl --style ./scripts/markdown-style.rb pages lint-changed: @./scripts/lint-changed.sh -.PHONY: index setup hooks deps lint lint-changed +.PHONY: default index setup hooks deps lint lint-changed From 136771d02a5466f52056048d5e565ed739737210 Mon Sep 17 00:00:00 2001 From: Igor Shubovych Date: Mon, 7 Dec 2015 03:51:25 +0200 Subject: [PATCH 3/4] Fix linting --- pages/common/uname.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pages/common/uname.md b/pages/common/uname.md index d27a4600cf..4fe43c359f 100644 --- a/pages/common/uname.md +++ b/pages/common/uname.md @@ -1,7 +1,6 @@ # uname -> Print details about the current machine and the operating system running on it - +> Print details about the current machine and the operating system running on it. > Note: If you're on Linux, try also the `lsb_release` command. - Print hardware-related information: machine and processor From 1c30a894907fd28903eebf6820e8fda1263900d2 Mon Sep 17 00:00:00 2001 From: Igor Shubovych Date: Mon, 7 Dec 2015 04:01:44 +0200 Subject: [PATCH 4/4] Remove lint-changed scipt, just make lint everything instead --- Makefile | 5 +---- scripts/lint-changed.sh | 6 ------ scripts/pre-commit | 2 +- 3 files changed, 2 insertions(+), 11 deletions(-) delete mode 100755 scripts/lint-changed.sh diff --git a/Makefile b/Makefile index ae83325c33..72e126749f 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,4 @@ deps: lint: @bundle exec mdl --style ./scripts/markdown-style.rb pages -lint-changed: - @./scripts/lint-changed.sh - -.PHONY: default index setup hooks deps lint lint-changed +.PHONY: default index setup hooks deps lint diff --git a/scripts/lint-changed.sh b/scripts/lint-changed.sh deleted file mode 100755 index 022cee27f4..0000000000 --- a/scripts/lint-changed.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/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 73130ee76e..53769a2552 100644 --- a/scripts/pre-commit +++ b/scripts/pre-commit @@ -1,3 +1,3 @@ #!/bin/sh -make lint-changed +make lint