$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;
if ($collated_output)
{
eval {
- open(my $orig_manifest, '-|', 'arv', 'keep', 'get', $collated_output)
+ open(my $orig_manifest, '-|', 'arv-get', $collated_output)
or die "failed to get collated manifest: $!";
# Read the original manifest, and strip permission hints from it,
# so we can put the result in a Collection.
my $hash = shift;
my ($keep, $child_out, $output_block);
- my $cmd = "$arv_cli keep get \Q$hash\E";
+ my $cmd = "arv-get \Q$hash\E";
open($keep, '-|', $cmd) or die "fetch_block: $cmd: $!";
sysread($keep, $output_block, 64 * 1024 * 1024);
close $keep;
Log (undef, "collate");
my ($child_out, $child_in);
- my $pid = open2($child_out, $child_in, $arv_cli, 'keep', 'put', '--raw');
+ my $pid = open2($child_out, $child_in, 'arv-put', '--raw');
my $joboutput;
for (@jobstep)
{
sysread($child_out, $joboutput, 64 * 1024 * 1024);
chomp($joboutput);
} else {
- Log (undef, "timed out reading from 'arv keep put'");
+ Log (undef, "timed out reading from 'arv-put'");
}
}
waitpid($pid, 0);
return if $justcheckpoint; # checkpointing is not relevant post-Warehouse.pm
$local_logfile->flush;
- my $cmd = "$arv_cli keep put --filename ''\Q$keep_logfile\E "
+ my $cmd = "arv-put --filename ''\Q$keep_logfile\E "
. quotemeta($local_logfile->filename);
my $loglocator = `$cmd`;
die "system $cmd failed: $?" if $?;