X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/27ae43f3b4d700a1a35db514130fb17824ae9c80..c47872d7d78f44040494892d91ccbb8970d1907a:/cmd/arvados-client/cmd.go

diff --git a/cmd/arvados-client/cmd.go b/cmd/arvados-client/cmd.go
index b616b54bd9..4550ae53ac 100644
--- a/cmd/arvados-client/cmd.go
+++ b/cmd/arvados-client/cmd.go
@@ -5,24 +5,19 @@
 package main
 
 import (
-	"fmt"
-	"io"
 	"os"
-	"regexp"
-	"runtime"
 
 	"git.curoverse.com/arvados.git/lib/cli"
 	"git.curoverse.com/arvados.git/lib/cmd"
 )
 
 var (
-	version                = "dev"
-	cmdVersion cmd.Handler = versionCmd{}
-	handler                = cmd.Multi(map[string]cmd.Handler{
-		"-e":        cmdVersion,
-		"version":   cmdVersion,
-		"-version":  cmdVersion,
-		"--version": cmdVersion,
+	version = "dev"
+	handler = cmd.Multi(map[string]cmd.Handler{
+		"-e":        cmd.Version(version),
+		"version":   cmd.Version(version),
+		"-version":  cmd.Version(version),
+		"--version": cmd.Version(version),
 
 		"copy":     cli.Copy,
 		"create":   cli.Create,
@@ -61,14 +56,6 @@ var (
 	})
 )
 
-type versionCmd struct{}
-
-func (versionCmd) RunCommand(prog string, args []string, _ io.Reader, stdout, _ io.Writer) int {
-	prog = regexp.MustCompile(` -*version$`).ReplaceAllLiteralString(prog, "")
-	fmt.Fprintf(stdout, "%s %s (%s)\n", prog, version, runtime.Version())
-	return 0
-}
-
 func fixLegacyArgs(args []string) []string {
 	flags, _ := cli.LegacyFlagSet()
 	return cmd.SubcommandToFront(args, flags)