Merge branch 'patch-1' of https://github.com/mr-c/arvados into mr-c-patch-1

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

diff --git a/cmd/arvados-client/cmd.go b/cmd/arvados-client/cmd.go
index 4550ae53aced128d0698891c76d95a1730cae316..bcc3dda09ac91559d4a35227ef81c95bf3e979cd 100644 (file)
--- a/cmd/arvados-client/cmd.go
+++ b/cmd/arvados-client/cmd.go
@@ -7,27 +7,26 @@ package main
 import (
        "os"
 
-       "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/deduplicationreport"
+       "git.arvados.org/arvados.git/lib/mount"
 )
 
 var (
-       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),
+               "-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,
@@ -53,6 +52,9 @@ var (
                "user":                     cli.APICall,
                "virtual_machine":          cli.APICall,
                "workflow":                 cli.APICall,
+
+               "mount":                mount.Command,
+               "deduplication-report": deduplicationreport.Command,
        })
 )