Merge branch 'master' into 3699-arv-copy

[arvados.git] / sdk / cli / bin / arv

diff --git a/sdk/cli/bin/arv b/sdk/cli/bin/arv
index 337d9abdefb84f403e8111c189797af9614468ec..ec3d8061b52a82f98b5dfe9163b4a74c20030b35 100755 (executable)
--- a/sdk/cli/bin/arv
+++ b/sdk/cli/bin/arv
@@ -2,7 +2,7 @@
 
 # Arvados cli client
 #
-# Ward Vandewege <ward@clinicalfuture.com>
+# Ward Vandewege <ward@curoverse.com>
 
 require 'fileutils'
 
@@ -118,7 +118,7 @@ def check_subcommands client, arvados, subcommand, global_opts, remaining_opts
   case subcommand
   when 'keep'
     @sub = remaining_opts.shift
-    if ['get', 'put', 'ls', 'normalize'].index @sub then
+    if ['get', 'put', 'ls', 'normalize', 'copy'].index @sub then
       # Native Arvados
       exec `which arv-#{@sub}`.strip, *remaining_opts
     elsif ['less', 'check'].index @sub then
@@ -358,10 +358,6 @@ end
 
 def help_resources(option_parser, discovery_document, resource)
   option_parser.educate
-
-  if not resource.nil? and resource != '--help' then
-    Trollop::die "Unknown resource type #{resource.inspect}"
-  end
   exit 255
 end