tange/parallel
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/parallel.git synced 2024-11-29 09:27:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

parallel: fixed --interactive.

Browse source 
parallel: fixed --basefile with --workdir.
This commit is contained in:
Ole Tange 2016-05-09 00:03:11 +02:00
parent 9d9016b88f
commit 17a50e3354
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/parallel
View file

@ -2928,7 +2928,11 @@ sub setup_basefile {
::error("Work dir '...' will not work with relative basefiles."); ::error("Work dir '...' will not work with relative basefiles.");
::wait_and_exit(255); ::wait_and_exit(255);
} }
$workdir ||= Job->new("")->workdir(); if(not $workdir) {
my $dummycmdline = CommandLine->new(1,"true",0,0,0,0,0,{},{},{});
my $dummyjob = Job->new($dummycmdline);
$workdir = $dummyjob->workdir();
}
$cmd .= $sshlogin->rsync_transfer_cmd($file,$workdir) . "&"; $cmd .= $sshlogin->rsync_transfer_cmd($file,$workdir) . "&";
} }
} }
@ -2944,7 +2948,12 @@ sub cleanup_basefile {
# @opt::basefile # @opt::basefile
# Returns: N/A # Returns: N/A
my $cmd = ""; my $cmd = "";
my $workdir = Job->new("")->workdir(); my $workdir;
if(not $workdir) {
my $dummycmdline = CommandLine->new(1,"true",0,0,0,0,0,{},{},{});
my $dummyjob = Job->new($dummycmdline);
$workdir = $dummyjob->workdir();
}
for my $sshlogin (values %Global::host) { for my $sshlogin (values %Global::host) {
if($sshlogin->string() eq ":") { next } if($sshlogin->string() eq ":") { next }
for my $file (@opt::basefile) { for my $file (@opt::basefile) {
@ -7532,13 +7541,15 @@ sub start {
my $command = $job->wrapped(); my $command = $job->wrapped();
my $pid; my $pid;
if($Global::interactive or $Global::stderr_verbose) {
$job->interactive_start();
}
# Must be run after $job->interactive_start():
# $job->interactive_start() may call $job->skip()
if($job->{'commandline'}{'skip'}) { if($job->{'commandline'}{'skip'}) {
# $job->skip() was called # $job->skip() was called
$command = "true"; $command = "true";
} }
if($Global::interactive or $Global::stderr_verbose) {
$job->interactive_start();
}
$job->openoutputfiles(); $job->openoutputfiles();
my($stdout_fh,$stderr_fh) = ($job->fh(1,"w"),$job->fh(2,"w")); my($stdout_fh,$stderr_fh) = ($job->fh(1,"w"),$job->fh(2,"w"));
if($opt::ungroup or $opt::sqlworker) { if($opt::ungroup or $opt::sqlworker) {