Skip to content

Commit

Permalink
Fix Makefile and update Readme
Browse files Browse the repository at this point in the history
  • Loading branch information
chetanyakan committed Apr 10, 2019
1 parent e61538b commit 6532c99
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
11 changes: 6 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,10 @@ ifneq ($(HAS_SERVER),)
go get golang.org/x/tools/cmd/vet; \
fi
@echo ${BOLD}Running GOVET${RESET}
@cd server
$(eval PKGS := $(shell go list ./... | grep -v /vendor/))
@$(GO) vet -shadow $(PKGS)
@$(GO) get golang.org/x/tools/go/analysis/passes/shadow/cmd/shadow
@$(eval PKGS := $(shell go list ./server/... | grep -v /vendor/))
@$(GO) vet $(PKGS)
@$(GO) vet -vettool=$(GOPATH)/bin/shadow $(PKGS)
@echo ${GREEN}"govet success\n"${RESET}
endif

Expand Down Expand Up @@ -94,7 +95,7 @@ format: fix-js fix-go

fix-js:
ifneq ($(HAS_WEBAPP),)
@echo ${BOLD}Formatting js giles${RESET}
@echo ${BOLD}Formatting js files${RESET}
@cd webapp && npm run fix
@echo "formatted js files\n"
endif
Expand All @@ -105,7 +106,7 @@ ifneq ($(HAS_SERVER),)
echo "--> installing goimports"; \
go get golang.org/x/tools/cmd/goimports; \
fi
@echo ${BOLD}Formatting go giles${RESET}
@echo ${BOLD}Formatting go files${RESET}
@cd server
@find ./ -type f -name "*.go" -not -path "./server/vendor/*" -exec goimports -w {} \;
@echo "formatted go files\n"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ A mattermost plugin to disable direct messages and group chats.
#### Platform & tools
- Make sure you have following components installed:

* Go - v1.11 - https://golang.org/doc/install
* Go - v1.12 - https://golang.org/doc/install
> **Note:** If you have installed Go to a custom location, make sure the $GOROOT variable is set properly. Refer [Installing to a custom location](https://golang.org/doc/install#install).
* NodeJS - v10.11 and NPM - v6.4.1 - https://docs.npmjs.com/getting-started/installing-node
Expand Down

0 comments on commit 6532c99

Please sign in to comment.