From 53883d3e319d07c94aa128d998ef0765833906cd Mon Sep 17 00:00:00 2001 From: Ole Tange Date: Mon, 25 Aug 2014 07:06:13 +0200 Subject: [PATCH] parallel-local22.sh: Testsuite for #42999. --- src/parallel | 6 ++-- src/parallel_tutorial.1 | 8 ++++-- src/parallel_tutorial.html | 7 +++-- testsuite/tests-to-run/parallel-local22.sh | 8 +++++- testsuite/wanted-results/parallel-local22 | 33 ++++++++++++++++++++-- 5 files changed, 52 insertions(+), 10 deletions(-) diff --git a/src/parallel b/src/parallel index 9e6b8857..ca747e8b 100755 --- a/src/parallel +++ b/src/parallel @@ -5201,8 +5201,8 @@ sub sshlogin_wrap { if(@Global::cat_partials) { # Prepend: # < /tmp/foo perl -e 'while(@ARGV) { sysseek(STDIN,shift,0) || die; $left = shift; while($read = sysread(STDIN,$buf, ($left > 32768 ? 32768 : $left))){ $left -= $read; syswrite(STDOUT,$buf); } }' 0 0 0 11 | - $self->{'sshlogin_wrap'} = (pop @Global::cat_partials). "|". - $next_command_line; + $self->{'sshlogin_wrap'} = (shift @Global::cat_partials). "|". + "(". $next_command_line. ")"; } else { $self->{'sshlogin_wrap'} = $next_command_line; } @@ -5210,7 +5210,7 @@ sub sshlogin_wrap { # --transfer $pre .= $self->sshtransfer(); if(@Global::cat_partials) { - $pre .= (pop @Global::cat_partials)."|"; + $pre .= (shift @Global::cat_partials)."|"; } # --return $post .= $self->sshreturn(); diff --git a/src/parallel_tutorial.1 b/src/parallel_tutorial.1 index 48434205..b2a9817d 100644 --- a/src/parallel_tutorial.1 +++ b/src/parallel_tutorial.1 @@ -2776,6 +2776,9 @@ I hope you have learned something from this tutorial. .PP If you like \s-1GNU\s0 Parallel: .IP "\(bu" 2 +(Re\-)walk through the tutorial if you have not done so in the past year +(http://www.gnu.org/software/parallel/parallel_tutorial.html) +.IP "\(bu" 2 Give a demo at your local user group/team/colleagues .IP "\(bu" 2 Post the intro videos and the tutorial on Reddit, Diaspora*, @@ -2792,6 +2795,7 @@ Please cite \s-1GNU\s0 Parallel in you publications (use \-\-bibtex) .PP If \s-1GNU\s0 Parallel saves you money: .IP "\(bu" 2 -(Have your company) donate to \s-1FSF\s0 https://my.fsf.org/donate/ +(Have your company) donate to \s-1FSF\s0 or become a member +https://my.fsf.org/donate/ .PP -(C) 20140622 Ole Tange GPLv3 +(C) 2013,2014 Ole Tange, GPLv3 diff --git a/src/parallel_tutorial.html b/src/parallel_tutorial.html index d894106d..9f5dc946 100644 --- a/src/parallel_tutorial.html +++ b/src/parallel_tutorial.html @@ -2102,6 +2102,9 @@