Skip to content
This repository was archived by the owner on May 11, 2022. It is now read-only.

Commit 84a8251

Browse files
kamilskkamilsk
committed
sync and up tools
1 parent 7fb0a3d commit 84a8251

File tree

61 files changed

+1852
-701
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+1852
-701
lines changed

‎.travis.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ cache:
99
env:
1010
global:
1111
- CODECLIMATE=https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64
12-
- GOFLAGS=-mod=vendor
1312

1413
go:
1514
- master

‎Makefile‎

Lines changed: 35 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@
44

55
SHELL = /bin/bash -euo pipefail
66

7-
GO = GOPRIVATE=$(GOPRIVATE) GOFLAGS=$(GOFLAGS) go
87
GO111MODULE = on
98
GOFLAGS = -mod=vendor
109
GOPRIVATE = go.octolab.net
1110
GOPROXY = direct
1211
LOCAL = $(MODULE)
13-
MODULE = $(shell $(GO) list -m)
14-
PACKAGES = $(shell $(GO) list ./... 2> /dev/null)
15-
PATHS = $(shell $(GO) list ./... 2> /dev/null | sed -e "s|$(MODULE)/\{0,1\}||g")
12+
MODULE = `go list -m`
13+
PACKAGES = `go list ./... 2> /dev/null`
14+
PATHS = $(shell echo $(PACKAGES) | sed -e "s|$(MODULE)/\{0,1\}||g")
1615
TIMEOUT = 1s
1716

1817
ifeq (, $(PACKAGES))
@@ -23,12 +22,17 @@ ifeq (, $(PATHS))
2322
PATHS = .
2423
endif
2524

25+
export GO111MODULE := $(GO111MODULE)
26+
export GOFLAGS := $(GOFLAGS)
27+
export GOPRIVATE := $(GOPRIVATE)
28+
export GOPROXY := $(GOPROXY)
29+
2630
.PHONY: go-env
2731
go-env:
28-
@echo "GO111MODULE: $(shell $(GO) env GO111MODULE)"
29-
@echo "GOFLAGS: $(strip $(shell $(GO) env GOFLAGS))"
30-
@echo "GOPRIVATE: $(strip $(shell $(GO) env GOPRIVATE))"
31-
@echo "GOPROXY: $(strip $(shell $(GO) env GOPROXY))"
32+
@echo "GO111MODULE: `go env GO111MODULE`"
33+
@echo "GOFLAGS: $(strip `go env GOFLAGS`)"
34+
@echo "GOPRIVATE: $(strip `go env GOPRIVATE`)"
35+
@echo "GOPROXY: $(strip `go env GOPROXY`)"
3236
@echo "LOCAL: $(LOCAL)"
3337
@echo "MODULE: $(MODULE)"
3438
@echo "PACKAGES: $(PACKAGES)"
@@ -37,51 +41,55 @@ go-env:
3741

3842
.PHONY: deps
3943
deps:
40-
@$(GO) mod tidy
41-
@if [[ "$(shell $(GO) env GOFLAGS)" =~ -mod=vendor ]]; then $(GO) mod vendor; fi
44+
@go mod tidy
45+
@if [[ "`go env GOFLAGS`" =~ -mod=vendor ]]; then go mod vendor; fi
4246

4347
.PHONY: deps-clean
4448
deps-clean:
45-
@$(GO) clean -modcache
49+
@go clean -modcache
4650

4751
.PHONY: update
4852
update: selector = '.Require[] | select(.Indirect != true) | .Path'
4953
update:
5054
@if command -v egg > /dev/null; then \
51-
packages="$(shell egg deps list)"; \
52-
$(GO) get -mod= -u $$packages; \
55+
packages="`egg deps list`"; \
56+
go get -mod= -u $$packages; \
5357
elif command -v jq > /dev/null; then \
54-
packages="$(shell $(GO) mod edit -json | jq -r $(selector))"; \
55-
$(GO) get -mod= -u $$packages; \
58+
packages="`go mod edit -json | jq -r $(selector)`"; \
59+
go get -mod= -u $$packages; \
5660
else \
5761
packages="$(shell cat go.mod | grep -v '// indirect' | grep '\t' | awk '{print $$1}')"; \
58-
$(GO) get -mod= -u $$packages; \
62+
go get -mod= -u $$packages; \
5963
fi
6064

61-
BINARY = $(BINPATH)/$(shell basename $(MODULE))
65+
BINARY = $(BINPATH)/$(shell basename $(MAIN))
6266
BINPATH = $(PWD)/bin
6367
COMMIT = $(shell git rev-parse --verify HEAD)
6468
DATE = $(shell date +%Y-%m-%dT%T%Z)
6569
LDFLAGS = -ldflags "-s -w -X main.commit=$(COMMIT) -X main.date=$(DATE)"
70+
MAIN = $(MODULE)
6671

67-
export PATH := $(BINPATH):$(PATH)
72+
export GOBIN := $(BINPATH)
73+
export PATH := $(BINPATH):$(PATH)
6874

6975
.PHONY: build-env
7076
build-env:
7177
@echo "BINARY: $(BINARY)"
7278
@echo "BINPATH: $(BINPATH)"
7379
@echo "COMMIT: $(COMMIT)"
7480
@echo "DATE: $(DATE)"
81+
@echo "GOBIN: `go env GOBIN`"
7582
@echo "LDFLAGS: $(LDFLAGS)"
83+
@echo "MAIN: $(MAIN)"
84+
@echo "PATH: $$PATH"
7685

7786
.PHONY: build
78-
build: MAIN = .
7987
build:
80-
@$(GO) build -o $(BINARY) $(LDFLAGS) $(MAIN)
88+
@go build -o $(BINARY) $(LDFLAGS) $(MAIN)
8189

8290
.PHONY: build-clean
8391
build-clean:
84-
@$(GO) clean -cache
92+
@go clean -cache
8593

8694
.PHONY: install
8795
install: build
@@ -92,31 +100,31 @@ install-clean:
92100

93101
.PHONY: test
94102
test:
95-
@$(GO) test -race -timeout $(TIMEOUT) $(PACKAGES)
103+
@go test -race -timeout $(TIMEOUT) $(PACKAGES)
96104

97105
.PHONY: test-clean
98106
test-clean:
99-
@$(GO) clean -testcache
107+
@go clean -testcache
100108

101109
.PHONY: test-with-coverage
102110
test-with-coverage:
103-
@$(GO) test -cover -timeout $(TIMEOUT) $(PACKAGES) | column -t | sort -r
111+
@go test -cover -timeout $(TIMEOUT) $(PACKAGES) | column -t | sort -r
104112

105113
.PHONY: test-with-coverage-profile
106114
test-with-coverage-profile:
107-
@$(GO) test -cover -covermode count -coverprofile c.out -timeout $(TIMEOUT) $(PACKAGES)
115+
@go test -cover -covermode count -coverprofile c.out -timeout $(TIMEOUT) $(PACKAGES)
108116

109117
.PHONY: dist
110118
dist:
111-
@godownloader .goreleaser.yml > .github/install.sh
119+
@godownloader .goreleaser.yml > bin/install
112120

113121
.PHONY: format
114122
format:
115123
@goimports -local $(LOCAL) -ungroup -w $(PATHS)
116124

117125
.PHONY: generate
118126
generate:
119-
@$(GO) generate $(PACKAGES)
127+
@go generate $(PACKAGES)
120128

121129

122130
.PHONY: clean

‎bin/activate‎

Lines changed: 74 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,67 @@
11
#!/usr/bin/env bash
22

33
deactivate () {
4-
if [[ -n "${_OLD_PATH:-}" ]]; then
5-
export PATH="${_OLD_PATH:-}"
4+
unset _BINPATH
5+
unset _ROOT
6+
if [[ -v _OLD_GO111MODULE ]]; then
7+
export GO111MODULE="${_OLD_GO111MODULE}"
8+
if [[ -z "${_OLD_GO111MODULE}" ]]; then
9+
unset GO111MODULE
10+
fi
11+
unset _OLD_GO111MODULE
12+
fi
13+
if [[ -v _OLD_GOBIN ]]; then
14+
export GOBIN="${_OLD_GOBIN}"
15+
if [[ -z "${_OLD_GOBIN}" ]]; then
16+
unset GOBIN
17+
fi
18+
unset _OLD_GOBIN
19+
fi
20+
if [[ -v _OLD_GOFLAGS ]]; then
21+
export GOFLAGS="${_OLD_GOFLAGS}"
22+
if [[ -z "${_OLD_GOFLAGS}" ]]; then
23+
unset GOFLAGS
24+
fi
25+
unset _OLD_GOFLAGS
26+
fi
27+
if [[ -v _OLD_GOPRIVATE ]]; then
28+
export GOPRIVATE="${_OLD_GOPRIVATE}"
29+
if [[ -z "${_OLD_GOPRIVATE}" ]]; then
30+
unset GOPRIVATE
31+
fi
32+
unset _OLD_GOPRIVATE
33+
fi
34+
if [[ -v _OLD_GOPROXY ]]; then
35+
export GOPROXY="${_OLD_GOPROXY}"
36+
if [[ -z "${_OLD_GOPROXY}" ]]; then
37+
unset GOPROXY
38+
fi
39+
unset _OLD_GOPROXY
40+
fi
41+
if [[ -v _OLD_PATH ]]; then
42+
export PATH="${_OLD_PATH}"
643
unset _OLD_PATH
744
fi
45+
if [[ -n "${_OLD_PS1:-}" ]]; then
46+
export PS1="${_OLD_PS1}"
47+
unset _OLD_PS1
48+
fi
849

950
if [[ -n "${BASH:-}" || -n "${ZSH_VERSION:-}" ]]; then
1051
hash -r
1152
fi
1253

13-
if [[ -n "${_OLD_PS1:-}" ]]; then
14-
PS1="${_OLD_PS1:-}"
15-
export PS1
16-
unset _OLD_PS1
17-
fi
18-
1954
if [[ ! "${1:-}" = "nondestructive" ]]; then
2055
unset -f deactivate
21-
unset -f realpath
2256
unset -f get
23-
unset -f up
57+
unset -f realpath
2458
unset -f tools
59+
unset -f up
2560
fi
61+
}
2662

27-
unset BINPATH
28-
unset ROOT
63+
get () {
64+
go get -mod= $@
2965
}
3066

3167
realpath () {
@@ -36,37 +72,43 @@ realpath () {
3672
echo "$(cd `dirname ${1}` && pwd)/${1}"
3773
}
3874

39-
get () {
40-
go get -mod= $@
75+
tools () {
76+
(cd "${_ROOT%/}"/tools && make $@)
4177
}
4278

4379
up () {
4480
get -u $@
45-
go mod tidy && go mod vendor
46-
}
47-
48-
tools () {
49-
(cd "${ROOT%/}"/tools && make $@)
81+
go mod tidy
82+
if [[ "`go env GOFLAGS`" =~ -mod=vendor ]]; then go mod vendor; fi
5083
}
5184

5285
deactivate nondestructive
5386

87+
_BINPATH=$(realpath $(dirname "${BASH_SOURCE[0]:-$0}"))
88+
_ROOT=$(dirname "${_BINPATH}")/
89+
90+
_OLD_GO111MODULE="${GO111MODULE}"
91+
_OLD_GOBIN="${GOBIN}"
92+
_OLD_GOFLAGS="${GOFLAGS}"
93+
_OLD_GOPRIVATE="${GOPRIVATE}"
94+
_OLD_GOPROXY="${GOPROXY}"
5495
_OLD_PATH="${PATH}"
55-
export BINPATH=$(realpath $(dirname "${BASH_SOURCE[0]:-$0}"))
56-
export PATH="${BINPATH}:${PATH}"
57-
export ROOT=$(dirname "${BINPATH}")/
96+
_OLD_PS1="${PS1:-}"
5897

59-
if [[ -z "${BINPATH_DISABLE_PROMPT:-}" ]]; then
60-
_OLD_PS1="${PS1:-}"
61-
if [[ "x(activated) " != x ]]; then
62-
PS1="(activated) ${PS1:-}"
63-
elif [[ "`basename \"$BINPATH\"`" = "__" ]]; then
64-
PS1="[`basename \`dirname \"$BINPATH\"\``] $PS1"
65-
else
66-
PS1="(`basename \"$BINPATH\"`)$PS1"
67-
fi
68-
export PS1
98+
export GO111MODULE=on
99+
export GOBIN="${_BINPATH}"
100+
export GOFLAGS=-mod=vendor
101+
export GOPRIVATE=go.octolab.net
102+
export GOPROXY=direct
103+
export PATH="${_BINPATH}:${PATH}"
104+
if [[ "x(activated) " != x ]]; then
105+
PS1="(activated) ${PS1:-}"
106+
elif [[ "`basename \"${_BINPATH}\"`" = "__" ]]; then
107+
PS1="[`basename \`dirname \"${_BINPATH}\"\``] $PS1"
108+
else
109+
PS1="(`basename \"${_BINPATH}\"`)$PS1"
69110
fi
111+
export PS1
70112

71113
if [[ -n "${BASH:-}" || -n "${ZSH_VERSION:-}" ]]; then
72114
hash -r

0 commit comments

Comments
 (0)