Properly exits when UI is not instanciated (#91)

Calls `util.Cleanup`
- during fatal errors while interacting with docker
- after `rootCmd` successful execution
This commit is contained in:
Thomas 2018-11-27 03:42:01 +01:00 committed by Alex Goodman
parent d9ec426300
commit 6a32573d89
2 changed files with 4 additions and 0 deletions

View File

@ -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)
}

View File

@ -31,6 +31,7 @@ func Execute() {
fmt.Println(err)
utils.Exit(1)
}
utils.Cleanup()
}
func init() {