iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't send every source file through the shell

This commit is contained in:
Matthew Hooker 2018-05-01 22:55:10 -07:00
parent c163fbed35
commit fac6b2e71b
No known key found for this signature in database
GPG Key ID: 7B5F933D9CE8C6A1
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -4,12 +4,13 @@ VET?=$(shell ls -d */ | grep -v vendor | grep -v website)
GITSHA:=$(shell git rev-parse HEAD) GITSHA:=$(shell git rev-parse HEAD)
# Get the current local branch name from git (if we can, this may be blank) # Get the current local branch name from git (if we can, this may be blank)
GITBRANCH:=$(shell git symbolic-ref --short HEAD 2>/dev/null) GITBRANCH:=$(shell git symbolic-ref --short HEAD 2>/dev/null)
GOFMT_FILES?=$$(find . -not -path "./vendor/*" -name "*.go")
BAD_FILES=$(shell echo $(GOFMT_FILES) | xargs gofmt -s -l)
GOOS=$(shell go env GOOS) GOOS=$(shell go env GOOS)
GOARCH=$(shell go env GOARCH) GOARCH=$(shell go env GOARCH)
GOPATH=$(shell go env GOPATH) GOPATH=$(shell go env GOPATH)
# gofmt
UNFORMATTED_FILES=$(shell find . -not -path "./vendor/*" -name "*.go" | xargs gofmt -s -l)
# Get the git commit # Get the git commit
GIT_DIRTY=$(shell test -n "`git status --porcelain`" && echo "+CHANGES" || true) GIT_DIRTY=$(shell test -n "`git status --porcelain`" && echo "+CHANGES" || true)
GIT_COMMIT=$(shell git rev-parse --short HEAD) GIT_COMMIT=$(shell git rev-parse --short HEAD)
@ -59,13 +60,13 @@ dev: deps ## Build and install a development build
@cp $(GOPATH)/bin/packer pkg/$(GOOS)_$(GOARCH) @cp $(GOPATH)/bin/packer pkg/$(GOOS)_$(GOARCH)
fmt: ## Format Go code fmt: ## Format Go code
@gofmt -w -s $(GOFMT_FILES) @gofmt -w -s $(UNFORMATTED_FILES)
fmt-check: ## Check go code formatting fmt-check: ## Check go code formatting
@echo "==> Checking that code complies with gofmt requirements..." @echo "==> Checking that code complies with gofmt requirements..."
@if [ ! -z "$(BAD_FILES)" ]; then \ @if [ ! -z "$(UNFORMATTED_FILES)" ]; then \
echo "gofmt needs to be run on the following files:"; \ echo "gofmt needs to be run on the following files:"; \
echo "$(BAD_FILES)" | xargs -n1; \ echo "$(UNFORMATTED_FILES)" | xargs -n1; \
echo "You can use the command: \`make fmt\` to reformat code."; \ echo "You can use the command: \`make fmt\` to reformat code."; \
exit 1; \ exit 1; \
else \ else \