From b5d5eee2dd269f88f181d7a437be80194bfd0235 Mon Sep 17 00:00:00 2001 From: xenolf Date: Thu, 12 May 2016 19:52:59 +0200 Subject: [PATCH] Update usage of codegangster/cli to remove deprecation warning. Fixes #206. --- cli.go | 4 +++- cli_handlers.go | 14 ++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/cli.go b/cli.go index 052fc763..10cd7054 100644 --- a/cli.go +++ b/cli.go @@ -144,7 +144,7 @@ func main() { app.Run(os.Args) } -func dnshelp(c *cli.Context) { +func dnshelp(c *cli.Context) error { fmt.Printf( `Credentials for DNS providers must be passed through environment variables. @@ -175,4 +175,6 @@ Here is an example bash command using the CloudFlare DNS provider: fmt.Println(` For a more detailed explanation of a DNS provider's credential variables, please consult their online documentation.`) + + return nil } diff --git a/cli_handlers.go b/cli_handlers.go index 1601c43b..5585bcfb 100644 --- a/cli_handlers.go +++ b/cli_handlers.go @@ -196,7 +196,7 @@ func handleTOS(c *cli.Context, client *acme.Client, acc *Account) { } } -func run(c *cli.Context) { +func run(c *cli.Context) error { conf, acc, client := setup(c) if acc.Registration == nil { reg, err := client.Register() @@ -245,9 +245,11 @@ func run(c *cli.Context) { } saveCertRes(cert, conf) + + return nil } -func revoke(c *cli.Context) { +func revoke(c *cli.Context) error { conf, _, client := setup(c) @@ -269,9 +271,11 @@ func revoke(c *cli.Context) { logger().Print("Certificate was revoked.") } } + + return nil } -func renew(c *cli.Context) { +func renew(c *cli.Context) error { conf, _, client := setup(c) if len(c.GlobalStringSlice("domains")) <= 0 { @@ -299,7 +303,7 @@ func renew(c *cli.Context) { } if int(expTime.Sub(time.Now()).Hours()/24.0) > c.Int("days") { - return + return nil } } @@ -330,4 +334,6 @@ func renew(c *cli.Context) { } saveCertRes(newCert, conf) + + return nil }