X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/5d5af52a33ec8b10a9af6afd50141db3923441ec..6de571a660401585bc96dd92fd2563e9b64c58c6:/cmd/arvados-client/cmd.go

diff --git a/cmd/arvados-client/cmd.go b/cmd/arvados-client/cmd.go
index b616b54bd9..19d13437c8 100644
--- a/cmd/arvados-client/cmd.go
+++ b/cmd/arvados-client/cmd.go
@@ -5,34 +5,30 @@
 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/costanalyzer"
+	"git.arvados.org/arvados.git/lib/deduplicationreport"
+	"git.arvados.org/arvados.git/lib/diagnostics"
+	"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 +54,18 @@ var (
 		"user":                     cli.APICall,
 		"virtual_machine":          cli.APICall,
 		"workflow":                 cli.APICall,
+
+		"connect-ssh":          connectSSHCommand{},
+		"costanalyzer":         costanalyzer.Command,
+		"deduplication-report": deduplicationreport.Command,
+		"diagnostics":          diagnostics.Command{},
+		"logs":                 logsCommand{},
+		"mount":                mount.Command,
+		"shell":                shellCommand{},
+		"sudo":                 sudoCommand{},
 	})
 )
 
-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)