diff options
| author | Jonathan Villemaire-Krajden <jonathan@j-vk.com> | 2018-05-07 16:04:09 +0200 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2018-05-07 07:04:09 -0700 |
| commit | 6c3d1fc1f8125493c07e2cfb6bbec02c6c5c9728 (patch) | |
| tree | b8104c4709599952550ea400d941675dd0ff3696 /Makefile | |
| parent | 09c67708853199c015d659ed2526107ad4c10772 (diff) | |
| download | chat-6c3d1fc1f8125493c07e2cfb6bbec02c6c5c9728.tar.gz chat-6c3d1fc1f8125493c07e2cfb6bbec02c6c5c9728.tar.bz2 chat-6c3d1fc1f8125493c07e2cfb6bbec02c6c5c9728.zip | |
Fix empty GOPATH behaviour in Makefile (#8724)
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -43,7 +43,7 @@ else endif # Golang Flags -GOPATH ?= $(GOPATH:):./vendor +GOPATH ?= $(shell go env GOPATH) GOFLAGS ?= $(GOFLAGS:) GO=go GO_LINKER_FLAGS ?= -ldflags \ @@ -198,9 +198,9 @@ stop-docker: ## Stops the docker containers for local development. fi @if [ $(shell docker ps -a | grep -ci mattermost-minio) -eq 1 ]; then \ - echo stopping mattermost-minio; \ - docker stop mattermost-minio > /dev/null; \ - fi + echo stopping mattermost-minio; \ + docker stop mattermost-minio > /dev/null; \ + fi @if [ $(shell docker ps -a | grep -ci mattermost-elasticsearch) -eq 1 ]; then \ echo stopping mattermost-elasticsearch; \ @@ -273,7 +273,7 @@ gofmt: ## Runs gofmt against all packages. store-mocks: ## Creates mock files. go get github.com/vektra/mockery/... - GOPATH=$(shell go env GOPATH) $(shell go env GOPATH)/bin/mockery -dir store -all -output store/storetest/mocks -note 'Regenerate this file using `make store-mocks`.' + $(GOPATH)/bin/mockery -dir store -all -output store/storetest/mocks -note 'Regenerate this file using `make store-mocks`.' update-jira-plugin: ## Updates Jira plugin. go get github.com/mattermost/go-bindata/... |