Merge pull request #1048 from remind101/fix-double-msgs

Stop double confirmation messages

cmd/emp/destroy.go

@@ -7,7 +7,7 @@ import (
 )
 
 var cmdDestroy = &Command{
-	Run:             maybeMessage(runDestroy),
+	Run:             confirmDestroy(maybeMessage(runDestroy)),
 	Usage:           "destroy <name>",
 	OptionalMessage: true,
 	Category:        "app",
@@ -29,13 +29,20 @@ Example:
 `,
 }
 
+func confirmDestroy(action func(cmd *Command, args []string)) func(cmd *Command, args []string) {
+	return func(cmd *Command, args []string) {
+		cmd.AssertNumArgsCorrect(args)
+
+		appname := args[0]
+		warning := fmt.Sprintf("This will destroy %s and its add-ons. Please type %q to continue:", appname, appname)
+		mustConfirm(warning, appname)
+		action(cmd, args)
+	}
+}
+
 func runDestroy(cmd *Command, args []string) {
-	cmd.AssertNumArgsCorrect(args)
-	appname := args[0]
 	message := getMessage()
-
-	warning := fmt.Sprintf("This will destroy %s and its add-ons. Please type %q to continue:", appname, appname)
-	mustConfirm(warning, appname)
+	appname := args[0]
 
 	must(client.AppDelete(appname, message))
 	log.Printf("Destroyed %s.", appname)