arvados-cli 0.1.20140415111149 → 0.1.20140415171002

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c2d7752c4120eafbf6fee46a5a310d2ed5d7f05
-  data.tar.gz: 1cad27f2c0f70785b0c509932600e6ce5fcb2134
+  metadata.gz: 8e5bff96b6197f74a2595a83b33bad5c43a261d1
+  data.tar.gz: 3b3218c7638c6982eed06cdd9a8d63730f9502e8
 SHA512:
-  metadata.gz: 2d156d689a130f3cbaf4df85f5169692b3269c9c927f25c455226ba348ca91593eb3b02089ff80ee220835ac080c04f21718ccc30cc14ca165afef0fc2108856
-  data.tar.gz: a2847a54e34e4145824a511b68274909f36cc4dfcd6b85aedfb6e145b4dd9781df1a46f64431f456c40e2479b3a2c80db419031487f0e497a683096c4315963e
+  metadata.gz: c8575fe11b6d0c51b44abdea405563772a5a203936b6c6c249d6fa6eb1379eebbcb00a7e294de412f2945bdf1bb4cff019458fb897722ba3da096e646b0593d8
+  data.tar.gz: 712617c534e52128082a424df200bf2f0ae9da074c58cfefb2ba2042a5a7a970b791d50332a957c12355c574328f9071115a4e2f318662604835b52c48a0a6ad

data/bin/crunch-job

@@ -95,6 +95,15 @@ $ENV{"CRUNCH_INSTALL"} = "$ENV{CRUNCH_TMP}/opt";
 $ENV{"CRUNCH_WORK"} = $ENV{"JOB_WORK"}; # deprecated
 mkdir ($ENV{"JOB_WORK"});
 
+my $arv_cli;
+
+if (defined $ENV{"ARV_CLI"}) {
+  $arv_cli = $ENV{"ARV_CLI"};
+}
+else {
+  $arv_cli = 'arv';
+}
+
 my $force_unlock;
 my $git_dir;
 my $jobspec;
@@ -1074,7 +1083,7 @@ sub fetch_block
   my $hash = shift;
   my ($keep, $child_out, $output_block);
 
-  my $cmd = "arv keep get \Q$hash\E";
+  my $cmd = "$arv_cli keep get \Q$hash\E";
   open($keep, '-|', $cmd) or die "fetch_block: $cmd: $!";
   sysread($keep, $output_block, 64 * 1024 * 1024);
   close $keep;
@@ -1086,7 +1095,7 @@ sub collate_output
   Log (undef, "collate");
 
   my ($child_out, $child_in);
-  my $pid = open2($child_out, $child_in, 'arv', 'keep', 'put', '--raw');
+  my $pid = open2($child_out, $child_in, $arv_cli, 'keep', 'put', '--raw');
   my $joboutput;
   for (@jobstep)
   {
@@ -1236,7 +1245,7 @@ sub save_meta
   return if $justcheckpoint;  # checkpointing is not relevant post-Warehouse.pm
 
   $local_logfile->flush;
-  my $cmd = "arv keep put --filename ''\Q$keep_logfile\E "
+  my $cmd = "$arv_cli keep put --filename ''\Q$keep_logfile\E "
       . quotemeta($local_logfile->filename);
   my $loglocator = `$cmd`;
   die "system $cmd failed: $?" if $?;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arvados-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.20140415111149
+  version: 0.1.20140415171002
 platform: ruby
 authors:
 - Arvados Authors
@@ -146,7 +146,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
-description: This is the Arvados SDK CLI gem, git revision c2aeaa729c350a33ec47ae1b012e50a6685ac2d2
+description: This is the Arvados SDK CLI gem, git revision 52b3716d78c410806e8aaea89994b39015694258
 email: gem-dev@curoverse.com
 executables:
 - arv