From 6a32573d89a379a634310e40b24c13e4fbdf76e1 Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 27 Nov 2018 03:42:01 +0100 Subject: [PATCH] Properly exits when UI is not instanciated (#91) Calls `util.Cleanup` - during fatal errors while interacting with docker - after `rootCmd` successful execution --- cmd/build.go | 3 +++ cmd/root.go | 1 + 2 files changed, 4 insertions(+) diff --git a/cmd/build.go b/cmd/build.go index 81b6069..13089c1 100644 --- a/cmd/build.go +++ b/cmd/build.go @@ -27,6 +27,7 @@ func doBuild(cmd *cobra.Command, args []string) { defer utils.Cleanup() iidfile, err := ioutil.TempFile("/tmp", "dive.*.iid") if err != nil { + utils.Cleanup() log.Fatal(err) } defer os.Remove(iidfile.Name()) @@ -34,11 +35,13 @@ func doBuild(cmd *cobra.Command, args []string) { allArgs := append([]string{"--iidfile", iidfile.Name()}, args...) err = utils.RunDockerCmd("build", allArgs...) if err != nil { + utils.Cleanup() log.Fatal(err) } imageId, err := ioutil.ReadFile(iidfile.Name()) if err != nil { + utils.Cleanup() log.Fatal(err) } diff --git a/cmd/root.go b/cmd/root.go index 3cf10bb..5e27ac6 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -31,6 +31,7 @@ func Execute() { fmt.Println(err) utils.Exit(1) } + utils.Cleanup() } func init() {