From 65d5b8b937c1dd418b4d95d1d97a04680c52c0a3 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 3 Nov 2017 11:26:46 +0100 Subject: [PATCH] Align version output and minor code cleanup This patch changes the output of `ctr version` to align version and revision. It also changes `.Printf()` to `.Println()`, to make the code slightly easier to read. Before this change: $ ctr version Client: Version: v1.0.0-beta.2-132-g564600e.m Revision: 564600ee79aefb0f24cbcecc90d4388bd0ea59de.m Server: Version: v1.0.0-beta.2-132-g564600e.m Revision: 564600ee79aefb0f24cbcecc90d4388bd0ea59de.m With this patch applied: $ ctr version Client: Version: v1.0.0-beta.2-132-g564600e.m Revision: 564600ee79aefb0f24cbcecc90d4388bd0ea59de.m Server: Version: v1.0.0-beta.2-132-g564600e.m Revision: 564600ee79aefb0f24cbcecc90d4388bd0ea59de.m Signed-off-by: Sebastiaan van Stijn --- cmd/ctr/commands/version/version.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/cmd/ctr/commands/version/version.go b/cmd/ctr/commands/version/version.go index 37dd52e02..8b1e91546 100644 --- a/cmd/ctr/commands/version/version.go +++ b/cmd/ctr/commands/version/version.go @@ -9,14 +9,14 @@ import ( "github.com/urfave/cli" ) -// Command is a cli ommand to output the client and containerd server version +// Command is a cli command to output the client and containerd server version var Command = cli.Command{ Name: "version", Usage: "print the client and server versions", Action: func(context *cli.Context) error { fmt.Println("Client:") - fmt.Printf(" Version: %s\n", version.Version) - fmt.Printf(" Revision: %s\n", version.Revision) + fmt.Println(" Version: ", version.Version) + fmt.Println(" Revision:", version.Revision) fmt.Println("") client, ctx, cancel, err := commands.NewClient(context) if err != nil { @@ -28,13 +28,13 @@ var Command = cli.Command{ return err } fmt.Println("Server:") - fmt.Printf(" Version: %s\n", v.Version) - fmt.Printf(" Revision: %s\n", v.Revision) + fmt.Println(" Version: ", v.Version) + fmt.Println(" Revision:", v.Revision) if v.Version != version.Version { - fmt.Fprintf(os.Stderr, "WARNING: version mismatch\n") + fmt.Fprintln(os.Stderr, "WARNING: version mismatch") } if v.Revision != version.Revision { - fmt.Fprintf(os.Stderr, "WARNING: revision mismatch\n") + fmt.Fprintln(os.Stderr, "WARNING: revision mismatch") } return nil },