Skip to content

Make bbctl delete --force skip confirmation prompt #81

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bru02 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Make bbctl delete --force skip confirmation prompt #81

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions cmd/bbctl/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ var deleteCommand = &cli.Command{
&cli.BoolFlag{
Name: "force",
Aliases: []string{"f"},
Usage: "Force delete the bridge, even if it's not self-hosted or doesn't seem to exist.",
Usage: "Force delete the bridge without confirmation, even if it's not self-hosted or doesn't seem to exist.",
},
},
}
Expand Down Expand Up @@ -79,12 +79,14 @@ func deleteBridge(ctx *cli.Context) error {
}
}

var confirmation bool
err = survey.AskOne(&survey.Confirm{Message: fmt.Sprintf("Are you sure you want to permanently delete %s?", bridge)}, &confirmation)
if err != nil {
return err
} else if !confirmation {
return fmt.Errorf("bridge delete cancelled")
if !ctx.Bool("force") {
var confirmation bool
err = survey.AskOne(&survey.Confirm{Message: fmt.Sprintf("Are you sure you want to permanently delete %s?", bridge)}, &confirmation)
if err != nil {
return err
} else if !confirmation {
return fmt.Errorf("bridge delete cancelled")
}
}
err = beeperapi.DeleteBridge(homeserver, bridge, accessToken)
if err != nil {
Expand Down