15061: Add missing file

[arvados.git] / cmd / arvados-client / cmd.go

diff --git a/cmd/arvados-client/cmd.go b/cmd/arvados-client/cmd.go
index b616b54bd95ea45e7faf852b7a926a00fa9e2830..4550ae53aced128d0698891c76d95a1730cae316 100644 (file)
--- 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)