Merge remote-tracking branch 'origin/develop'

CHANGELOG.md

@@ -1,6 +1,15 @@
 # Changelog
 
-## [0.3.1] (2021-02-03)
+## [0.4.0] (2021-02-08)
+
+### New Features
+
+* Support configuration file:
+  * zkcli will try to read ~/.config/zkcli.conf as default configuration(can be changed with `-config` argument) if the file exists.
+
+### Changes
+
+* No longer output logs from zk library. You can run command with `-v` argument to output logs.
 
 ### Internal changes
 
@@ -52,3 +61,4 @@ Built: 2018-05-30T13:44:21+0000
 
 [0.2.0]: https://github.com/let-us-go/zkcli/compare/v0.1.0...v0.2.0
 [0.3.0]: https://github.com/let-us-go/zkcli/compare/v0.2.0...v0.3.0
+[0.4.0]: https://github.com/let-us-go/zkcli/compare/v0.3.0...v0.4.0

Makefile

@@ -25,7 +25,7 @@ release:
 	rm -rf $(DISTDIR)/$(RELDIR)
 	mkdir -p $(DISTDIR)/$(RELDIR)
 	go clean
-	GOOS=$(GOOS) GOARCH=$(GOARCH) go build -ldflags ${LDFLAGS}
+	GOOS=$(GOOS) GOARCH=$(GOARCH) make build
 	cp $(PROJECT)$(SUFFIX_EXE) $(DISTDIR)/$(RELDIR)/
 	tar czf $(DISTDIR)/$(ARCNAME).tar.gz -C $(DISTDIR) $(RELDIR)
 	go clean
@@ -34,11 +34,12 @@ release:
 release-all:
 	@$(MAKE) release GOOS=linux   GOARCH=amd64
 	@$(MAKE) release GOOS=linux   GOARCH=386
+	@$(MAKE) release GOOS=linux   GOARCH=arm64
 	@$(MAKE) release GOOS=darwin  GOARCH=amd64
 
 .PHONY: build
 build:
-	go build
+	CGO_ENABLED=0 go build -ldflags ${LDFLAGS}
 
 .PHONY: lint
 lint:

main.go

@@ -15,7 +15,7 @@ import (
 var gitCommit = "unknown"
 var built = "unknown"
 
-const version = "0.3.1"
+const version = "0.4.0"
 
 func main() {
 	servers := flag.String("s", "127.0.0.1:2181", "Servers")

zkcli.conf

@@ -1 +1,4 @@
-s 127.0.0.1:2181
+s 127.0.0.1:2181
+u ''
+p ''
+v true