From 508af1e705080734f7787f2e2b1baa10efa2b911 Mon Sep 17 00:00:00 2001 From: Finn Date: Tue, 2 Feb 2021 21:49:17 -0800 Subject: [PATCH] Remove things that aren't supported by the version of cobra in debian --- cmd/signaldctl/cmd/completion.go | 7 +------ debian/rules | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/cmd/signaldctl/cmd/completion.go b/cmd/signaldctl/cmd/completion.go index 43746d3..d4d284b 100644 --- a/cmd/signaldctl/cmd/completion.go +++ b/cmd/signaldctl/cmd/completion.go @@ -67,18 +67,13 @@ PS> signaldctl completion powershell > signaldctl.ps1 `, DisableFlagsInUseLine: true, Annotations: map[string]string{common.AnnotationNoSocketConnection: "true"}, - ValidArgs: []string{"bash", "zsh", "fish", "powershell"}, - Args: cobra.ExactValidArgs(1), + ValidArgs: []string{"bash", "zsh"}, Run: func(cmd *cobra.Command, args []string) { switch args[0] { case "bash": common.Must(cmd.Root().GenBashCompletion(os.Stdout)) case "zsh": common.Must(cmd.Root().GenZshCompletion(os.Stdout)) - case "fish": - common.Must(cmd.Root().GenFishCompletion(os.Stdout, true)) - case "powershell": - common.Must(cmd.Root().GenPowerShellCompletion(os.Stdout)) } }, } diff --git a/debian/rules b/debian/rules index 6a9db60..47a79a9 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,7 @@ export DH_GOLANG_EXCLUDES := tools/ PKG := gitlab.com/signald/signald-go -GO_LDFLAGS += -X $(PKG)/cmd/signaldctl/common.Version=$(DEB_VERSION) +# GO_LDFLAGS += -X $(PKG)/cmd/signaldctl/common.Version=$(DEB_VERSION) GO_LDFLAGS += -X $(PKG)/cmd/signaldctl/common.Branch=$(shell git rev-parse HEAD) GO_LDFLAGS += -X $(PKG)/cmd/signaldctl/common.Commit=$(CI_BUILD_REF)