diff --git a/.travis.yml b/.travis.yml index d98ed73..6096dae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,6 @@ language: go go: - "1.8.x" -go_import_path: fuse - cache: directories: - vendor diff --git a/bin/cmd/apply.go b/bin/cmd/apply.go index 9cc8563..b1168a8 100644 --- a/bin/cmd/apply.go +++ b/bin/cmd/apply.go @@ -3,7 +3,7 @@ package cmd import ( "errors" "fmt" - "fuse/pkg/kubectl" + "github.com/Dalee/fuse/pkg/kubectl" "github.com/spf13/cobra" "os" "time" diff --git a/bin/cmd/exec.go b/bin/cmd/exec.go index 89ff057..4aca1e9 100644 --- a/bin/cmd/exec.go +++ b/bin/cmd/exec.go @@ -3,7 +3,7 @@ package cmd import ( "errors" "fmt" - "fuse/pkg/kubectl" + "github.com/Dalee/fuse/pkg/kubectl" "github.com/spf13/cobra" ) diff --git a/bin/cmd/garbage-collect.go b/bin/cmd/garbage-collect.go index 50c428c..f50c621 100644 --- a/bin/cmd/garbage-collect.go +++ b/bin/cmd/garbage-collect.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" - "fuse/pkg/kubectl" - "fuse/pkg/reference" + "github.com/Dalee/fuse/pkg/kubectl" + "github.com/Dalee/fuse/pkg/reference" "github.com/Dalee/hitman/pkg/registry" "github.com/spf13/cobra" diff --git a/bin/cmd/root.go b/bin/cmd/root.go index 3265c9a..67a4241 100644 --- a/bin/cmd/root.go +++ b/bin/cmd/root.go @@ -1,7 +1,7 @@ package cmd import ( - "fuse/pkg/kubectl" + "github.com/Dalee/fuse/pkg/kubectl" "github.com/spf13/cobra" "os" ) diff --git a/bin/main.go b/bin/main.go index 310d6c9..8e7df07 100644 --- a/bin/main.go +++ b/bin/main.go @@ -1,7 +1,7 @@ package main import ( - "fuse/bin/cmd" + "github.com/Dalee/fuse/bin/cmd" "os" ) diff --git a/glide.lock b/glide.lock index 3d8ea51..50c3710 100644 --- a/glide.lock +++ b/glide.lock @@ -1,5 +1,5 @@ -hash: ce947e5c93de78b75c1f4413fcb91d9e58b7e6a04718f8091cbf3f6a4b3a51e8 -updated: 2017-02-18T16:25:33.973970669+03:00 +hash: 41acc916486f752fb218b6de24f1507af931adf1f64f1bc241af1e0c76e82a4a +updated: 2017-09-28T15:00:32.35447212+03:00 imports: - name: github.com/Dalee/hitman version: f86df5948ec31df8f3ccd45cdd5882a11b174256 @@ -12,11 +12,11 @@ imports: - name: github.com/inconshreveable/mousetrap version: 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75 - name: github.com/spf13/cobra - version: b5d8e8f46a2f829f755b6e33b454e25c61c935e1 + version: 5deb57bbca49eb370538fc295ba4b2988f9f5e09 subpackages: - cobra - name: github.com/spf13/pflag - version: 9ff6c6923cfffbcd502984b8e0c80539a94968b7 + version: 5ccb023bc27df288a957c5e994cd44fd19619465 - name: github.com/spf13/viper version: 5ed0fc31f7f453625df314d8e66b9791e8d13003 - name: github.com/stretchr/testify diff --git a/glide.yaml b/glide.yaml index eb46380..abf6654 100644 --- a/glide.yaml +++ b/glide.yaml @@ -1,4 +1,4 @@ -package: fuse +package: github.com/Dalee/fuse import: - package: github.com/ghodss/yaml - package: github.com/spf13/cobra diff --git a/pkg/kubectl/command.go b/pkg/kubectl/command.go index 5f46223..6da046d 100644 --- a/pkg/kubectl/command.go +++ b/pkg/kubectl/command.go @@ -41,11 +41,11 @@ func (c *kubeCommand) Run() ([]byte, bool) { fmt.Printf("===> %s\n", strings.Join(c.getCommand().Args, " ")) // TODO: should be moved to logging result, err := c.getCommand().CombinedOutput() - if err != nil { - return []byte("Command failed to run"), false + if len(result) == 0 { + result = []byte("Command failed to run") } - return result, c.cmd.ProcessState.Success() + return result, err == nil } // Command getter