Merge branch '16100-mime-types'

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

diff --git a/cmd/arvados-client/cmd.go b/cmd/arvados-client/cmd.go
index b616b54bd95ea45e7faf852b7a926a00fa9e2830..887bc62bb322a7e5df7f41ab74efd9c74d82b655 100644 (file)
--- a/cmd/arvados-client/cmd.go
+++ b/cmd/arvados-client/cmd.go
@@ -5,34 +5,27 @@
 package main
 
 import (
-       "fmt"
-       "io"
        "os"
-       "regexp"
-       "runtime"
 
-       "git.curoverse.com/arvados.git/lib/cli"
-       "git.curoverse.com/arvados.git/lib/cmd"
+       "git.arvados.org/arvados.git/lib/cli"
+       "git.arvados.org/arvados.git/lib/cmd"
+       "git.arvados.org/arvados.git/lib/mount"
 )
 
 var (
-       version                = "dev"
-       cmdVersion cmd.Handler = versionCmd{}
-       handler                = cmd.Multi(map[string]cmd.Handler{
-               "-e":        cmdVersion,
-               "version":   cmdVersion,
-               "-version":  cmdVersion,
-               "--version": cmdVersion,
+       handler = cmd.Multi(map[string]cmd.Handler{
+               "-e":        cmd.Version,
+               "version":   cmd.Version,
+               "-version":  cmd.Version,
+               "--version": cmd.Version,
 
-               "copy":     cli.Copy,
-               "create":   cli.Create,
-               "edit":     cli.Edit,
-               "get":      cli.Get,
-               "keep":     cli.Keep,
-               "pipeline": cli.Pipeline,
-               "run":      cli.Run,
-               "tag":      cli.Tag,
-               "ws":       cli.Ws,
+               "copy":   cli.Copy,
+               "create": cli.Create,
+               "edit":   cli.Edit,
+               "get":    cli.Get,
+               "keep":   cli.Keep,
+               "tag":    cli.Tag,
+               "ws":     cli.Ws,
 
                "api_client_authorization": cli.APICall,
                "api_client":               cli.APICall,
@@ -58,17 +51,11 @@ var (
                "user":                     cli.APICall,
                "virtual_machine":          cli.APICall,
                "workflow":                 cli.APICall,
+
+               "mount": mount.Command,
        })
 )
 
-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)