X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/be9b62b5186bd9aa961f08f66bc104200acf760a..0c0f18dfbcdcf552889258b76563315fbe2eb060:/sdk/cli/bin/arv

diff --git a/sdk/cli/bin/arv b/sdk/cli/bin/arv
index ccdd8a8c12..185a5b0673 100755
--- a/sdk/cli/bin/arv
+++ b/sdk/cli/bin/arv
@@ -5,6 +5,7 @@
 # Ward Vandewege <ward@curoverse.com>
 
 require 'fileutils'
+require 'shellwords'
 
 if RUBY_VERSION < '1.9.3' then
   abort <<-EOS
@@ -88,7 +89,7 @@ end
 subcommands = %w(copy create edit get keep pipeline run tag ws)
 
 def exec_bin bin, opts
-  bin_path = `which #{bin}`.strip
+  bin_path = `which #{bin.shellescape}`.strip
   if bin_path.empty?
     raise "#{bin}: command not found"
   end
@@ -110,15 +111,12 @@ def check_subcommands client, arvados, subcommand, global_opts, remaining_opts
     if ['get', 'put', 'ls', 'normalize'].index @sub then
       # Native Arvados
       exec_bin "arv-#{@sub}", remaining_opts
-    elsif ['less', 'check'].index @sub then
-      # wh* shims
-      exec_bin "wh#{@sub}", remaining_opts
     elsif @sub == 'docker'
       exec_bin "arv-keepdocker", remaining_opts
     else
       puts "Usage: arv keep [method] [--parameters]\n"
       puts "Use 'arv keep [method] --help' to get more information about specific methods.\n\n"
-      puts "Available methods: ls, get, put, less, check, docker"
+      puts "Available methods: ls, get, put, docker"
     end
     abort
   when 'pipeline'
@@ -349,9 +347,9 @@ def arv_get client, arvados, global_opts, remaining_opts
   uuid = remaining_opts.shift
   if uuid.nil? or uuid == "-h" or uuid == "--help"
     puts head_banner
-    puts "Usage: arv get [uuid] [fields...]\n\n"
-    puts "Fetch the specified Arvados object, select the specified fields, \n"
-    puts "and print a text representation (json or yaml, use --format).\n"
+    puts "Usage: arv [--format json|yaml] get [uuid] [fields...]\n\n"
+    puts "Fetch the specified Arvados object, select the specified fields,\n"
+    puts "and print a text representation.\n"
     exit 255
   end