From 37291ba3bd24c57b251ce13a864e2d660eaf1ee6 Mon Sep 17 00:00:00 2001 From: Finn Date: Thu, 11 Feb 2021 17:37:07 -0800 Subject: [PATCH] Fix group leave --- Makefile | 2 +- cmd/signaldctl/cmd/group/leave/leave-group.go | 2 +- cmd/signaldctl/cmd/group/root.go | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4c7e089..84f33d5 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -signaldctl: signald/client-protocol +signaldctl: signald/client-protocol cmd/signaldctl go build -ldflags '-X gitlab.com/signald/signald-go/cmd/signaldctl/common.Version=$(shell git describe) -X gitlab.com/signald/signald-go/cmd/signaldctl/common.Branch=$(shell git rev-parse --abbrev-ref HEAD) -X gitlab.com/signald/signald-go/cmd/signaldctl/common.Commit=$(shell git rev-parse HEAD)' -o signaldctl ./cmd/signaldctl protocol.json: diff --git a/cmd/signaldctl/cmd/group/leave/leave-group.go b/cmd/signaldctl/cmd/group/leave/leave-group.go index 7d59b88..a3c2ef6 100644 --- a/cmd/signaldctl/cmd/group/leave/leave-group.go +++ b/cmd/signaldctl/cmd/group/leave/leave-group.go @@ -84,5 +84,5 @@ var ( ) func init() { - AcceptGroupInvitationCmd.Flags().StringVarP(&account, "account", "a", "", "the signald account to use") + LeaveGroupCmd.Flags().StringVarP(&account, "account", "a", "", "the signald account to use") } diff --git a/cmd/signaldctl/cmd/group/root.go b/cmd/signaldctl/cmd/group/root.go index c8b493d..2c514af 100644 --- a/cmd/signaldctl/cmd/group/root.go +++ b/cmd/signaldctl/cmd/group/root.go @@ -19,6 +19,7 @@ import ( "github.com/spf13/cobra" "gitlab.com/signald/signald-go/cmd/signaldctl/cmd/group/accept" + "gitlab.com/signald/signald-go/cmd/signaldctl/cmd/group/leave" "gitlab.com/signald/signald-go/cmd/signaldctl/cmd/group/list" "gitlab.com/signald/signald-go/cmd/signaldctl/cmd/group/show" ) @@ -32,4 +33,5 @@ func init() { GroupCmd.AddCommand(accept.AcceptGroupInvitationCmd) GroupCmd.AddCommand(list.ListGroupCmd) GroupCmd.AddCommand(show.ShowGroupCmd) + GroupCmd.AddCommand(leave.LeaveGroupCmd) }