From ceec42efdd37d2f1e2d8f2321e014434195ff2e7 Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Wed, 10 May 2017 21:37:48 +0800 Subject: [PATCH] bump easyssh package. Signed-off-by: Bo-Yi Wu --- vendor/github.com/appleboy/easyssh-proxy/Makefile | 12 ++++++------ vendor/github.com/appleboy/easyssh-proxy/easyssh.go | 3 --- vendor/vendor.json | 8 +++----- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/vendor/github.com/appleboy/easyssh-proxy/Makefile b/vendor/github.com/appleboy/easyssh-proxy/Makefile index 8557ce4..2bc6b11 100644 --- a/vendor/github.com/appleboy/easyssh-proxy/Makefile +++ b/vendor/github.com/appleboy/easyssh-proxy/Makefile @@ -1,8 +1,7 @@ .PHONY: test drone-ssh fmt vet errcheck lint install update coverage embedmd GOFMT ?= gofmt "-s" - -GOFILES := find . -name "*.go" -type f -not -path "./vendor/*" +GOFILES := $(shell find . -name "*.go" -type f -not -path "./vendor/*") PACKAGES ?= $(shell go list ./... | grep -v /vendor/) all: install lint @@ -14,16 +13,17 @@ install: govendor sync fmt: - $(GOFILES) | xargs $(GOFMT) -w + $(GOFMT) -w $(GOFILES) .PHONY: fmt-check fmt-check: # get all go files and run go fmt on them - @files=$$($(GOFILES) | xargs $(GOFMT) -l); if [ -n "$$files" ]; then \ + @diff=$$($(GOFMT) -d $(GOFILES)); \ + if [ -n "$$diff" ]; then \ echo "Please run 'make fmt' and commit the result:"; \ - echo "$${files}"; \ + echo "$${diff}"; \ exit 1; \ - fi; + fi; vet: go vet $(PACKAGES) diff --git a/vendor/github.com/appleboy/easyssh-proxy/easyssh.go b/vendor/github.com/appleboy/easyssh-proxy/easyssh.go index 60ac45b..d44e090 100644 --- a/vendor/github.com/appleboy/easyssh-proxy/easyssh.go +++ b/vendor/github.com/appleboy/easyssh-proxy/easyssh.go @@ -210,12 +210,9 @@ func (ssh_conf *MakeConfig) Stream(command string, timeout int) (stdout chan str select { case <-res: - stdoutChan <- "" - stderrChan <- "" errChan <- session.Wait() done <- true case <-timeoutChan: - stdoutChan <- "" stderrChan <- "Run Command Timeout!" errChan <- nil done <- false diff --git a/vendor/vendor.json b/vendor/vendor.json index 1efbe80..5fa7d98 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -3,12 +3,10 @@ "ignore": "test", "package": [ { - "checksumSHA1": "/Sb+z/BicEjhh6Ib7Tawr64BNHA=", + "checksumSHA1": "fmzCBkzzkd3KK/yfeMR8IYApkIE=", "path": "github.com/appleboy/easyssh-proxy", - "revision": "cf4f2bae639f692dbc7b3f852be35125a1a645e3", - "revisionTime": "2017-05-09T01:16:07Z", - "version": "1.1.3", - "versionExact": "1.1.3" + "revision": "aa0e30613aeb5cca179bd3982da8d2e06a1bb2a4", + "revisionTime": "2017-05-10T13:33:00Z" }, { "checksumSHA1": "dvabztWVQX8f6oMLRyv4dLH+TGY=",