From 40dcd6ec990ce4d1e039a0cf10691cc4c0f8627b Mon Sep 17 00:00:00 2001 From: James Shubin Date: Sun, 25 Feb 2018 02:13:51 -0500 Subject: [PATCH] all: Misc fixes and test fixes --- Makefile | 2 +- README.md | 2 +- docs/quick-start-guide.md | 4 ++-- test/test-bashfmt.sh | 4 ++++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 4f487c77..c719cb04 100644 --- a/Makefile +++ b/Makefile @@ -40,7 +40,7 @@ USERNAME := $(shell cat ~/.config/copr 2>/dev/null | grep username | awk -F '=' SERVER = 'dl.fedoraproject.org' REMOTE_PATH = 'pub/alt/$(USERNAME)/$(PROGRAM)' ifneq ($(GOTAGS),) - BUILD_FLAGS = -tags '$(GOTAGS)' + BUILD_FLAGS = -tags '$(GOTAGS)' endif GOOSARCHES ?= linux/amd64 linux/ppc64 linux/ppc64le linux/arm64 darwin/amd64 diff --git a/README.md b/README.md index 9bb421ab..55845ca0 100644 --- a/README.md +++ b/README.md @@ -35,9 +35,9 @@ Please read, enjoy and help improve our documentation! | Documentation | Additional Notes | |---|---| -| [general documentation](docs/documentation.md) | for everyone | | [quick start guide](docs/quick-start-guide.md) | for mgmt developers | | [frequently asked questions](docs/faq.md) | for everyone | +| [general documentation](docs/documentation.md) | for everyone | | [resource guide](docs/resource-guide.md) | for mgmt developers | | [language guide](docs/language-guide.md) | for everyone | | [style guide](docs/style-guide.md) | for mgmt developers | diff --git a/docs/quick-start-guide.md b/docs/quick-start-guide.md index 86c73f07..b0acc223 100644 --- a/docs/quick-start-guide.md +++ b/docs/quick-start-guide.md @@ -78,8 +78,8 @@ you can `vagrant ssh` into the `mgmt` machine. The MOTD will explain the rest. ## Using Docker -Alternatively, you can check [docker-guide](docs/docker-guide.md) in order to -develop or deploy using docker +Alternatively, you can check out the [docker-guide](docs/docker-guide.md) in +order to develop or deploy using docker. ## Information about dependencies diff --git a/test/test-bashfmt.sh b/test/test-bashfmt.sh index 544ff3fc..aceaf136 100755 --- a/test/test-bashfmt.sh +++ b/test/test-bashfmt.sh @@ -12,11 +12,15 @@ ROOT=$(dirname "${BASH_SOURCE}")/.. cd "${ROOT}" . test/util.sh +M="Makefile" find_files() { git ls-files | grep -e '\.sh$' -e '\.bash$' | grep -v 'misc/delta-cpu.sh' } bad_files=$( + if grep -q '^ ' "$M"; then + echo "$M" + fi for i in $(find_files); do # search for more than one leading space, to ensure we use tabs if grep -q '^ ' "$i"; then