Point "arv keep get/put" to arv-get/put and unsupport "arv get/put"

style.

refs #1646

diff --git a/sdk/cli/bin/arv b/sdk/cli/bin/arv
index 511359e81a78ae92de3fd1ce49aaea8f7c215ae4..e289a521e8b6f28b5f98e6934da2c0b609fc766f 100755 (executable)
--- a/sdk/cli/bin/arv
+++ b/sdk/cli/bin/arv
@@ -11,14 +11,14 @@ if RUBY_VERSION < '1.9.3' then
 end
 
 case ARGV[0]
-when 'get', 'put'
-  cmd = 'arv-' + ARGV.shift
-  exec `which #{cmd}`.strip, *ARGV
-  abort
 when 'keep'
   ARGV.shift
   @sub = ARGV.shift
-  if ['ls', 'get', 'put', 'less', 'check'].index @sub then
+  if ['get', 'put'].index @sub then
+    # Native Arvados
+    exec `which arv-#{@sub}`.strip, *ARGV
+  elsif ['ls', 'less', 'check'].index @sub then
+    # wh* shims
     exec `which wh#{@sub}`.strip, *ARGV
   else
     puts "Usage: \n" +