generate: prompt before overwriting

aviau · Jul 18, 2017 · 2c37138 · 2c37138
1 parent 7691bc5
commit 2c37138
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -94,4 +94,4 @@ This new command should connect to a server using an encrypted rsa key.
 - [ ] ``--clip, -c``
 - [ ] ``--in-place, -i``
 - [X] ``--force, -f``
-- [ ] Prompt before overwriting an existing password, unless --force or -f is specified.
+- [X] Prompt before overwriting an existing password, unless --force or -f is specified.
diff --git a/cmd/gopass/cli/cli.go b/cmd/gopass/cli/cli.go
@@ -314,9 +314,8 @@ func execGenerate(cmd *commandLine, args []string) error {
 
 	store := getStore(cmd)
 
-	if containsPassword, _ := store.ContainsPassword(passName); containsPassword {
-		if !force {
-			fmt.Fprintf(cmd.WriterOutput, "Error: '%s' already exists. Use -f to override.\n", passName)
+	if containsPassword, _ := store.ContainsPassword(passName); containsPassword && !force {
+		if !gopass_terminal.AskYesNo(cmd.WriterOutput, fmt.Sprintf("Password '%s' already esists. Would you like to overwrite? [y/n] ", passName)) {
 			return nil
 		}
 	}