From 6e9a5805d69306741451148ca53aff0540b45025 Mon Sep 17 00:00:00 2001 From: Medzik Date: Sat, 13 Nov 2021 12:31:50 +0000 Subject: [PATCH] feat(opts): add --no-update, move main.go => cmd/pingbot/main.go --- .goreleaser.yml | 7 ++++--- Dockerfile | 2 +- Makefile | 2 +- main.go => cmd/pingbot/main.go | 5 +++-- go.sum | 4 ---- 5 files changed, 9 insertions(+), 11 deletions(-) rename main.go => cmd/pingbot/main.go (93%) diff --git a/.goreleaser.yml b/.goreleaser.yml index c6a94a9..9d5392f 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -5,15 +5,16 @@ before: - go mod tidy builds: - - goos: + - main: ./cmd/pingbot + binary: '{{ .ProjectName }}.out' + + goos: - linux - freebsd goarch: - amd64 - arm64 - binary: '{{ .ProjectName }}.out' - ldflags: - -s -w - -X github.com/medzikuser/go-pingbot/config.Version={{ .RawVersion }} diff --git a/Dockerfile b/Dockerfile index d8050e1..e9df955 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,4 +2,4 @@ FROM alpine COPY pingbot.out /usr/bin/pingbot -ENTRYPOINT ["/usr/bin/pingbot"] +ENTRYPOINT ["/usr/bin/pingbot", "--no-update"] diff --git a/Makefile b/Makefile index 6ccca09..f145144 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ BUILD_FLAGS := build: $(GO) mod tidy - $(GO) build $(BUILD_FLAGS) -o $(BINARY_NAME) + $(GO) build ${BUILD_FLAGS} -o ${BINARY_NAME} ./cmd/pingbot snapshot: $(GORELEASER) --snapshot --rm-dist diff --git a/main.go b/cmd/pingbot/main.go similarity index 93% rename from main.go rename to cmd/pingbot/main.go index 707cf26..6c82722 100644 --- a/main.go +++ b/cmd/pingbot/main.go @@ -19,7 +19,8 @@ import ( var log = common.Log type cmdOpts struct { - Update bool `opts:"help=update version to latest e.g. if update is major"` + Update bool `opts:"help=update version to latest e.g. if update is major"` + NoUpdate bool `opts:"help=disable auto updater"` } func main() { @@ -100,7 +101,7 @@ func main() { os.Exit(1) } - if config.Toml.AutoUpdate.Enabled { + if config.Toml.AutoUpdate.Enabled && !c.NoUpdate { if config.Version == "dev" { log.Warn("You using dev version. Auto Update DISABLED!") } else { diff --git a/go.sum b/go.sum index 975493e..299e6c0 100644 --- a/go.sum +++ b/go.sum @@ -363,8 +363,6 @@ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20211109214657-ef0fda0de508 h1:v3NKo+t/Kc3EASxaKZ82lwK6mCf4ZeObQBduYFZHo7c= -golang.org/x/net v0.0.0-20211109214657-ef0fda0de508/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 h1:CIJ76btIcR3eFI5EgSo6k1qKw9KJexJuRLI9G7Hp5wE= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -425,8 +423,6 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211110154304-99a53858aa08 h1:WecRHqgE09JBkh/584XIE6PMz5KKE/vER4izNUi30AQ= -golang.org/x/sys v0.0.0-20211110154304-99a53858aa08/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211113001501-0c823b97ae02 h1:7NCfEGl0sfUojmX78nK9pBJuUlSZWEJA/TwASvfiPLo= golang.org/x/sys v0.0.0-20211113001501-0c823b97ae02/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=