Bugfix in unittest. Unittest from xargs works a little better.

doc/FUTURE_IDEAS

@@ -5,12 +5,62 @@ sql :foo 'select * from bar' | parallel --colsep '\s+\|\s+' do_stuff {4} {1}
 
 parallel -a table_file --colsep '\s+' do_stuff {4} {1}
 
+if(defined $::opt_colsep and defined @::opt_a and @::opt_a > 1) {
+   # must be done after converting :::: to -a -a
+   warn("--colsep incompatible with multiple argument files. Ignoring --colsep");
+   $::opt_colsep = undef;
+}
+
+if($::opt_colsep) {
+  # read input either from -a or from stdin
+  my $max_cols = 0;
+  my @table;
+  my $lineno = 0;
+  $Global::input_is_filename = 0; # cheat get_next_arg into not quoting
+  while get_next_arg {
+    my @cols = split /$::opt_colsep/o, $_;
+    if ($Global::trim) {
+       for(@cols) { s/^\s+//; s/\s+$//; }
+    }
+    $max_cols = max($#cols+1,$max_cols);
+    @table[$lineno++] = @cols;
+  }
+  $::opt_N = $max_cols;
+  for ($lineno = 0; $lineno <= $#table; $lineno++) {
+    if (not defined $table[$lineno][$max_col-1]) {
+      # Make sure the table has the same columns for all rows
+      $table[$lineno][$max_col-1] = "";
+    }
+    unget_arg(@table[$lineno]);
+  }
+}
+
 --autocolsep: Læs alle linjer.
 Prøv fastlængde: Find tegn, som står i alle linjer på de samme pladser. Risiko for falske pos
 Prøv fieldsep: Find eet tegn, som optræder det samme antal gange i alle linjer (tab sep)
 Prøv klyngesep: Find den samme klynge tegn, som står samme antal gange i alle linjer (' | ' sep)
 Fjern whitespace før og efter colonne
 
+hvis der er n af tegn A og 2n af tegn B, så 
+
+  a | b | c
+
+Simpleste: tab sep
+
+for hver linje
+  max,min count for hver char
+
+for hver char
+  if max == min :
+    potentiel
+    min_potentiel = min(min_potentiel,min)
+
+for potentiel:
+  if min % min_potentiel = 0: sepchars += potentiel,no of sepchars += min / min_potentiel
+
+colsep = [sepchars]{no_of_sepchars}
+
+
 # Hvordan udregnes system limits på remote systems hvis jeg ikke ved, hvormange
 # argumenter, der er? Lav system limits lokalt og lad det være max
 

unittest/tests-to-run/test17.sh

@@ -161,8 +161,8 @@ stdout ssh $SERVER1 ls '/tmp/parallel.file*' || echo OK
 # Should give: No such file or directory
 stdout ssh parallel@$SERVER2 ls '/tmp/parallel.file*' || echo OK
 
-echo '### --trc - multiple argument'
+echo '### --transfer --cleanup - multiple argument files'
-parallel -v --transfer --cleanup -Sparallel@$SERVER2 cat {2} {1} :::: /tmp/test17rel <(sort -r /tmp/test17abs)
+parallel -kv --transfer --cleanup -Sparallel@$SERVER2 cat {2} {1} :::: /tmp/test17rel <(sort -r /tmp/test17abs)
 # Should give: No such file or directory
 stdout ssh parallel@$SERVER2 ls '/tmp/parallel.file*' || echo OK
 

unittest/tests-to-run/test27.sh

@@ -6,168 +6,249 @@ echo '### Tests from xargs'
 rsync -Ha --delete input-files/xargs-inputs/ tmp/
 cd tmp
 
+echo '### -0 -n3 echo < files0.xi'
 stdout xargs -0 -n3 echo < files0.xi
 stdout parallel -k -0 -n3 echo < files0.xi
+echo '###  -d o -n1 echo < helloworld.xi'
 stdout xargs -d o -n1 echo < helloworld.xi
 stdout parallel -k -d o -n1 echo < helloworld.xi
+echo '###  -E_ -0 echo < eof_-0.xi'
 stdout xargs -E_ -0 echo < eof_-0.xi
 stdout parallel -k -E_ -0 echo < eof_-0.xi
+echo '###  -i -0 echo from \{\} to x{}y < items-0.xi'
 stdout xargs -i -0 echo from \{\} to x{}y < items-0.xi
 stdout parallel -k -i -0 echo from \{\} to x{}y < items-0.xi
+echo '###  -i -s26 -0 echo from \{\} to x{}y < items-0.xi'
 stdout xargs -i -s26 -0 echo from \{\} to x{}y < items-0.xi
 stdout parallel -k -i -s26 -0 echo from \{\} to x{}y < items-0.xi
+echo '###  -l -0 echo < ldata-0.xi'
 stdout xargs -l -0 echo < ldata-0.xi
 stdout parallel -k -l -0 echo < ldata-0.xi
+echo '###  -l -0 echo < ldatab-0.xi'
 stdout xargs -l -0 echo < ldatab-0.xi
 stdout parallel -k -l -0 echo < ldatab-0.xi
+echo '###  -L2 -0 echo < ldata-0.xi'
 stdout xargs -L2 -0 echo < ldata-0.xi
 stdout parallel -k -L2 -0 echo < ldata-0.xi
+echo '###  -L2 -0 echo < ldatab-0.xi'
 stdout xargs -L2 -0 echo < ldatab-0.xi
 stdout parallel -k -L2 -0 echo < ldatab-0.xi
+echo '###  -L3 -0 echo < ldata-0.xi'
 stdout xargs -L3 -0 echo < ldata-0.xi
 stdout parallel -k -L3 -0 echo < ldata-0.xi
+echo '###  -n1 -0 echo < stairs-0.xi'
 stdout xargs -n1 -0 echo < stairs-0.xi
 stdout parallel -k -n1 -0 echo < stairs-0.xi
+echo '###  -n2 -0 echo < stairs-0.xi'
 stdout xargs -n2 -0 echo < stairs-0.xi
 stdout parallel -k -n2 -0 echo < stairs-0.xi
+echo '###  -n2 -s26 -0 echo < stairs-0.xi'
 stdout xargs -n2 -s26 -0 echo < stairs-0.xi
 stdout parallel -k -n2 -s26 -0 echo < stairs-0.xi
+echo '###  -n2 -s26 -x -0 echo < stairs-0.xi'
 stdout xargs -n2 -s26 -x -0 echo < stairs-0.xi
 stdout parallel -k -n2 -s26 -x -0 echo < stairs-0.xi
+echo '###  -n3 -0 echo < stairs2-0.xi'
 stdout xargs -n3 -0 echo < stairs2-0.xi
 stdout parallel -k -n3 -0 echo < stairs2-0.xi
 stdout xargs -n3 -s36 -0 echo < stairs2-0.xi
 stdout parallel -k -n3 -s36 -0 echo < stairs2-0.xi
+echo '###  -0 echo < noeof-0.xi'
 stdout xargs -0 echo < noeof-0.xi
 stdout parallel -k -0 echo < noeof-0.xi
+echo '###  -P3 -n1 -IARG sh -c ARG < Pdata.xi'
 stdout xargs -P3 -n1 -IARG sh -c ARG < Pdata.xi
 stdout parallel -k -P3 -n1 -IARG sh -c ARG < Pdata.xi
+echo '###  -r echo this plus that < blank.xi'
 stdout xargs -r echo this plus that < blank.xi
 stdout parallel -k -r echo this plus that < blank.xi
+echo '###  -0 -s118 echo < stairs-0.xi'
 stdout xargs -0 -s118 echo < stairs-0.xi
 stdout parallel -k -0 -s118 echo < stairs-0.xi
+echo '###  -0 -s19 echo < stairs-0.xi'
 stdout xargs -0 -s19 echo < stairs-0.xi
 stdout parallel -k -0 -s19 echo < stairs-0.xi
+echo '###  -0 -s19 echo < stairs2-0.xi'
 stdout xargs -0 -s19 echo < stairs2-0.xi
 stdout parallel -k -0 -s19 echo < stairs2-0.xi
+echo '###  -0 -s20 echo < stairs-0.xi'
 stdout xargs -0 -s20 echo < stairs-0.xi
 stdout parallel -k -0 -s20 echo < stairs-0.xi
+echo '###  -0 -s30 echo < stairs-0.xi'
 stdout xargs -0 -s30 echo < stairs-0.xi
 stdout parallel -k -0 -s30 echo < stairs-0.xi
+echo '###  -0 echo this plus that < space.xi'
 stdout xargs -0 echo this plus that < space.xi
 stdout parallel -k -0 echo this plus that < space.xi
+echo '###  -r echo this plus that < space.xi'
 stdout xargs -r echo this plus that < space.xi
 stdout parallel -k -r echo this plus that < space.xi
+echo '###  -t -0 echo this plus that < space.xi'
 stdout xargs -t -0 echo this plus that < space.xi
 stdout parallel -k -t -0 echo this plus that < space.xi
+echo '###  true < 32767-ys.xi'
 stdout xargs true < 32767-ys.xi
 stdout parallel -k true < 32767-ys.xi
+echo '###  true < 16383-ys.xi'
 stdout xargs true < 16383-ys.xi
 stdout parallel -k true < 16383-ys.xi
+echo '###  -E EOF echo < EOFb.xi'
 stdout xargs -E EOF echo < EOFb.xi
 stdout parallel -k -E EOF echo < EOFb.xi
+echo '###  -E EOF echo < EOFe.xi'
 stdout xargs -E EOF echo < EOFe.xi
 stdout parallel -k -E EOF echo < EOFe.xi
+echo '###  -E EOF echo < EOF.xi'
 stdout xargs -E EOF echo < EOF.xi
 stdout parallel -k -E EOF echo < EOF.xi
+echo '###  -E_ echo < eof_.xi'
 stdout xargs -E_ echo < eof_.xi
 stdout parallel -k -E_ echo < eof_.xi
+echo '###  -E_ -IARG echo from ARG to xARGy < eof_.xi'
 stdout xargs -E_ -IARG echo from ARG to xARGy < eof_.xi
 stdout parallel -k -E_ -IARG echo from ARG to xARGy < eof_.xi
+echo '###  -s470 echo hi there < files.xi'
 stdout xargs -s470 echo hi there < files.xi
 stdout parallel -k -s470 echo hi there < files.xi
+echo '###  -IARG echo from ARG to xARGy -E_ < eof_.xi'
 stdout xargs -IARG echo from ARG to xARGy -E_ < eof_.xi
 stdout parallel -k -IARG echo from ARG to xARGy -E_ < eof_.xi
+echo '###  -IARG echo from ARG to xARGy < items.xi'
 stdout xargs -IARG echo from ARG to xARGy < items.xi
 stdout parallel -k -IARG echo from ARG to xARGy < items.xi
+echo '###  -IARG -s15 echo ARG < stairs.xi'
 stdout xargs -IARG -s15 echo ARG < stairs.xi
 stdout parallel -k -IARG -s15 echo ARG < stairs.xi
+echo '###  -L2 echo < ldatab.xi'
 stdout xargs -L2 echo < ldatab.xi
 stdout parallel -k -L2 echo < ldatab.xi
+echo '###  -L2 -n2 echo < ldata.xi'
 stdout xargs -L2 -n2 echo < ldata.xi
 stdout parallel -k -L2 -n2 echo < ldata.xi
+echo '###  -L3 echo < ldata.xi'
 stdout xargs -L3 echo < ldata.xi
 stdout parallel -k -L3 echo < ldata.xi
-stdout xargs -n1 < stairs.xi
+echo '###  -n1 echo < stairs.xi'
+stdout xargs -n1 echo < stairs.xi
 stdout parallel -k -n1 echo < stairs.xi
+echo '###  -n2 echo < stairs.xi'
 stdout xargs -n2 echo < stairs.xi
 stdout parallel -k -n2 echo < stairs.xi
+echo '###  -n2 -s26 echo < stairs.xi'
 stdout xargs -n2 -s26 echo < stairs.xi
 stdout parallel -k -n2 -s26 echo < stairs.xi
+echo '###  -n2 -s26 -x echo < stairs.xi'
 stdout xargs -n2 -s26 -x echo < stairs.xi
 stdout parallel -k -n2 -s26 -x echo < stairs.xi
+echo '###  -n3 echo < files.xi'
 stdout xargs -n3 echo < files.xi
 stdout parallel -k -n3 echo < files.xi
+echo '###  -n3 -s36 echo < stairs2.xi'
 stdout xargs -n3 -s36 echo < stairs2.xi
 stdout parallel -k -n3 -s36 echo < stairs2.xi
+echo '###  echo < noeof.xi'
 stdout xargs echo < noeof.xi
 stdout parallel -k echo < noeof.xi
+echo '###  echo < quotes.xi'
 stdout xargs echo < quotes.xi
 stdout parallel -k echo < quotes.xi
+echo '###  -s118 echo < stairs.xi'
 stdout xargs -s118 echo < stairs.xi
 stdout parallel -k -s118 echo < stairs.xi
+echo '###  -s19 echo < stairs2.xi'
 stdout xargs -s19 echo < stairs2.xi
 stdout parallel -k -s19 echo < stairs2.xi
+echo '###  -s19 echo < stairs.xi'
 stdout xargs -s19 echo < stairs.xi
 stdout parallel -k -s19 echo < stairs.xi
+echo '###  -s20 echo < stairs.xi'
 stdout xargs -s20 echo < stairs.xi
 stdout parallel -k -s20 echo < stairs.xi
+echo '###  -s30 echo < stairs.xi'
 stdout xargs -s30 echo < stairs.xi
 stdout parallel -k -s30 echo < stairs.xi
+echo '###  -s470 echo < files.xi'
 stdout xargs -s470 echo < files.xi
 stdout parallel -k -s470 echo < files.xi
+echo '###  -s47 echo < files.xi'
 stdout xargs -s47 echo < files.xi
 stdout parallel -k -s47 echo < files.xi
+echo '###  -s48 echo < files.xi'
 stdout xargs -s48 echo < files.xi
 stdout parallel -k -s48 echo < files.xi
+echo '###  -s6 echo < files.xi'
 stdout xargs -s6 echo < files.xi
 stdout parallel -k -s6 echo < files.xi
+echo '###  -iARG -s86 echo ARG is xARGx < files.xi'
 stdout xargs -iARG -s86 echo ARG is xARGx < files.xi
 stdout parallel -k -iARG -s86 echo ARG is xARGx < files.xi
+echo '###  echo this plus that < space.xi'
 stdout xargs echo this plus that < space.xi
 stdout parallel -k echo this plus that < space.xi
+echo '###  -IARG echo from ARG to xARGy < space.xi'
 stdout xargs -IARG echo from ARG to xARGy < space.xi
 stdout parallel -k -IARG echo from ARG to xARGy < space.xi
+echo '###  printf "\[%s\]\n" < verticaltabs.xi'
 stdout xargs printf "\[%s\]\n" < verticaltabs.xi
 stdout parallel -k printf "\[%s\]\n" < verticaltabs.xi
+echo '###  printf "\[%s\]\n" < formfeeds.xi'
 stdout xargs printf "\[%s\]\n" < formfeeds.xi
 stdout parallel -k printf "\[%s\]\n" < formfeeds.xi
+echo '###  -L2 echo < ldata.xi'
 stdout xargs -L2 echo < ldata.xi
 stdout parallel -k -L2 echo < ldata.xi
+echo '###  echo < unmatched2.xi'
 stdout xargs echo < unmatched2.xi
 stdout parallel -k echo < unmatched2.xi
+echo '###  echo < unmatched.xi'
 stdout xargs echo < unmatched.xi
 stdout parallel -k echo < unmatched.xi
-stdout xargs -n2 -x < unmatched.xi
+echo '###  -n2 -x echo < unmatched.xi'
-stdout parallel -k -n2 -x < unmatched.xi
+stdout xargs -n2 -x echo < unmatched.xi
-stdout xargs -eEOF < eofstr.xi
+stdout parallel -k -n2 -x echo < unmatched.xi
-stdout parallel -k -eEOF < eofstr.xi
+echo '###  -eEOF echo < eofstr.xi'
-stdout xargs -e < eof_.xi
+stdout xargs -eEOF echo < eofstr.xi
-stdout parallel -k -e < eof_.xi
+stdout parallel -k -eEOF echo < eofstr.xi
-stdout xargs -E_ < eof1.xi
+echo '###  -e echo < eof_.xi'
-stdout parallel -k -E_ < eof1.xi
+stdout xargs -e echo < eof_.xi
+stdout parallel -k -e echo < eof_.xi
+echo '###  -E_ echo < eof1.xi'
+stdout xargs -E_ echo < eof1.xi
+stdout parallel -k -E_ echo < eof1.xi
+echo '###  -iARG echo ARG is xARGx < files.xi'
 stdout xargs -iARG echo ARG is xARGx < files.xi
 stdout parallel -k -iARG echo ARG is xARGx < files.xi
+echo '###  -i echo from \{\} to x{}y < items.xi'
 stdout xargs -i echo from \{\} to x{}y < items.xi
 stdout parallel -k -i echo from \{\} to x{}y < items.xi
+echo '###  -i -s26 echo from \{\} to x{}y < items.xi'
 stdout xargs -i -s26 echo from \{\} to x{}y < items.xi
 stdout parallel -k -i -s26 echo from \{\} to x{}y < items.xi
+echo '###  -i__ echo FIRST __ IS OK < quotes.xi'
 stdout xargs -i__ echo FIRST __ IS OK < quotes.xi
 stdout parallel -k -i__ echo FIRST __ IS OK < quotes.xi
-stdout xargs -l < ldatab.xi
+echo '###  -l echo < ldatab.xi'
-stdout parallel -k -l < ldatab.xi
+stdout xargs -l echo < ldatab.xi
-stdout xargs -l < ldata.xi
+stdout parallel -k -l echo < ldatab.xi
-stdout parallel -k -l < ldata.xi
+echo '###  -l echo < ldata.xi'
-stdout xargs -l1 -n4 < files.xi
+stdout xargs -l echo < ldata.xi
-stdout parallel -k -l1 -n4 < files.xi
+stdout parallel -k -l echo < ldata.xi
-stdout xargs -l2 < files.xi
+echo '###  -l1 -n4 echo < files.xi'
-stdout parallel -k -l2 < files.xi
+stdout xargs -l1 -n4 echo < files.xi
-stdout xargs -s30 -t < stairs.xi
+stdout parallel -k -l1 -n4 echo < files.xi
-stdout parallel -k -s30 -t < stairs.xi
+echo '###  -l2 echo < files.xi'
+stdout xargs -l2 echo < files.xi
+stdout parallel -k -l2 echo < files.xi
+echo '###  -s30 -t echo < stairs.xi'
+stdout xargs -s30 -t echo < stairs.xi
+stdout parallel -k -s30 -t echo < stairs.xi
+echo '###  -t echo this plus that < space.xi'
 stdout xargs -t echo this plus that < space.xi
 stdout parallel -k -t echo this plus that < space.xi
+echo '###  -n1 printf "@%s@\n" < empty.xi'
 stdout xargs -n1 printf "@%s@\n" < empty.xi
 stdout parallel -k -n1 printf "@%s@\n" < empty.xi
+echo '###  -n2 -t echo < foobar.xi'
 stdout xargs -n2 -t echo < foobar.xi
 stdout parallel -k -n2 -t echo < foobar.xi
 

unittest/wanted-results/test17

@@ -571,43 +571,43 @@ OK
 good if no file
 ls: cannot access /tmp/parallel.file*: No such file or directory
 OK
-### --trc - multiple argument
+### --transfer --cleanup - multiple argument files
+rsync -rlDzRE -essh ./tmp/parallel.file1.file parallel@parallel-server2:./;rsync -rlDzRE -essh /tmp/parallel.file\>fire.file parallel@parallel-server2:/;ssh parallel@parallel-server2 cat\ /tmp/parallel.file\\\>fire.file\ tmp/parallel.file1.file;_EXIT_status=$?; ssh parallel@parallel-server2 rm -f tmp/parallel.file1.file;ssh parallel@parallel-server2 rm -f /tmp/parallel.file\\\>fire.file; exit $_EXIT_status;
+file>fire
+file1
+rsync -rlDzRE -essh ./tmp/parallel.file2.file parallel@parallel-server2:./;rsync -rlDzRE -essh /tmp/parallel.file9.file parallel@parallel-server2:/;ssh parallel@parallel-server2 cat\ /tmp/parallel.file9.file\ tmp/parallel.file2.file;_EXIT_status=$?; ssh parallel@parallel-server2 rm -f tmp/parallel.file2.file;ssh parallel@parallel-server2 rm -f /tmp/parallel.file9.file; exit $_EXIT_status;
+file9
+file2
+rsync -rlDzRE -essh ./tmp/parallel.file3.file parallel@parallel-server2:./;rsync -rlDzRE -essh /tmp/parallel.file8.file parallel@parallel-server2:/;ssh parallel@parallel-server2 cat\ /tmp/parallel.file8.file\ tmp/parallel.file3.file;_EXIT_status=$?; ssh parallel@parallel-server2 rm -f tmp/parallel.file3.file;ssh parallel@parallel-server2 rm -f /tmp/parallel.file8.file; exit $_EXIT_status;
+file8
+file3
+rsync -rlDzRE -essh ./tmp/parallel.file\>fire.file parallel@parallel-server2:./;rsync -rlDzRE -essh /tmp/parallel.file7.file parallel@parallel-server2:/;ssh parallel@parallel-server2 cat\ /tmp/parallel.file7.file\ tmp/parallel.file\\\>fire.file;_EXIT_status=$?; ssh parallel@parallel-server2 rm -f tmp/parallel.file\\\>fire.file;ssh parallel@parallel-server2 rm -f /tmp/parallel.file7.file; exit $_EXIT_status;
+file7
+file>fire
+rsync -rlDzRE -essh ./tmp/parallel.file5.file parallel@parallel-server2:./;rsync -rlDzRE -essh /tmp/parallel.file6.file parallel@parallel-server2:/;ssh parallel@parallel-server2 cat\ /tmp/parallel.file6.file\ tmp/parallel.file5.file;_EXIT_status=$?; ssh parallel@parallel-server2 rm -f tmp/parallel.file5.file;ssh parallel@parallel-server2 rm -f /tmp/parallel.file6.file; exit $_EXIT_status;
+file6
+file5
 rsync -rlDzRE -essh ./tmp/parallel.file6.file parallel@parallel-server2:./;rsync -rlDzRE -essh /tmp/parallel.file5.file parallel@parallel-server2:/;ssh parallel@parallel-server2 cat\ /tmp/parallel.file5.file\ tmp/parallel.file6.file;_EXIT_status=$?; ssh parallel@parallel-server2 rm -f tmp/parallel.file6.file;ssh parallel@parallel-server2 rm -f /tmp/parallel.file5.file; exit $_EXIT_status;
 file5
 file6
 rsync -rlDzRE -essh ./tmp/parallel.file7.file parallel@parallel-server2:./;rsync -rlDzRE -essh /tmp/parallel.file3.file parallel@parallel-server2:/;ssh parallel@parallel-server2 cat\ /tmp/parallel.file3.file\ tmp/parallel.file7.file;_EXIT_status=$?; ssh parallel@parallel-server2 rm -f tmp/parallel.file7.file;ssh parallel@parallel-server2 rm -f /tmp/parallel.file3.file; exit $_EXIT_status;
 file3
 file7
-rsync -rlDzRE -essh ./tmp/parallel.file5.file parallel@parallel-server2:./;rsync -rlDzRE -essh /tmp/parallel.file6.file parallel@parallel-server2:/;ssh parallel@parallel-server2 cat\ /tmp/parallel.file6.file\ tmp/parallel.file5.file;_EXIT_status=$?; ssh parallel@parallel-server2 rm -f tmp/parallel.file5.file;ssh parallel@parallel-server2 rm -f /tmp/parallel.file6.file; exit $_EXIT_status;
-file6
-file5
 rsync -rlDzRE -essh ./tmp/parallel.file8.file parallel@parallel-server2:./;rsync -rlDzRE -essh /tmp/parallel.file20.file parallel@parallel-server2:/;ssh parallel@parallel-server2 cat\ /tmp/parallel.file20.file\ tmp/parallel.file8.file;_EXIT_status=$?; ssh parallel@parallel-server2 rm -f tmp/parallel.file8.file;ssh parallel@parallel-server2 rm -f /tmp/parallel.file20.file; exit $_EXIT_status;
 file20
 file8
 rsync -rlDzRE -essh ./tmp/parallel.file9.file parallel@parallel-server2:./;rsync -rlDzRE -essh /tmp/parallel.file2.file parallel@parallel-server2:/;ssh parallel@parallel-server2 cat\ /tmp/parallel.file2.file\ tmp/parallel.file9.file;_EXIT_status=$?; ssh parallel@parallel-server2 rm -f tmp/parallel.file9.file;ssh parallel@parallel-server2 rm -f /tmp/parallel.file2.file; exit $_EXIT_status;
 file2
 file9
-rsync -rlDzRE -essh ./tmp/parallel.file1.file parallel@parallel-server2:./;rsync -rlDzRE -essh /tmp/parallel.file\>fire.file parallel@parallel-server2:/;ssh parallel@parallel-server2 cat\ /tmp/parallel.file\\\>fire.file\ tmp/parallel.file1.file;_EXIT_status=$?; ssh parallel@parallel-server2 rm -f tmp/parallel.file1.file;ssh parallel@parallel-server2 rm -f /tmp/parallel.file\\\>fire.file; exit $_EXIT_status;
-file>fire
-file1
-rsync -rlDzRE -essh ./tmp/parallel.file3.file parallel@parallel-server2:./;rsync -rlDzRE -essh /tmp/parallel.file8.file parallel@parallel-server2:/;ssh parallel@parallel-server2 cat\ /tmp/parallel.file8.file\ tmp/parallel.file3.file;_EXIT_status=$?; ssh parallel@parallel-server2 rm -f tmp/parallel.file3.file;ssh parallel@parallel-server2 rm -f /tmp/parallel.file8.file; exit $_EXIT_status;
-file8
-file3
-rsync -rlDzRE -essh ./tmp/parallel.file2.file parallel@parallel-server2:./;rsync -rlDzRE -essh /tmp/parallel.file9.file parallel@parallel-server2:/;ssh parallel@parallel-server2 cat\ /tmp/parallel.file9.file\ tmp/parallel.file2.file;_EXIT_status=$?; ssh parallel@parallel-server2 rm -f tmp/parallel.file2.file;ssh parallel@parallel-server2 rm -f /tmp/parallel.file9.file; exit $_EXIT_status;
-file9
-file2
-rsync -rlDzRE -essh ./tmp/parallel.file\>fire.file parallel@parallel-server2:./;rsync -rlDzRE -essh /tmp/parallel.file7.file parallel@parallel-server2:/;ssh parallel@parallel-server2 cat\ /tmp/parallel.file7.file\ tmp/parallel.file\\\>fire.file;_EXIT_status=$?; ssh parallel@parallel-server2 rm -f tmp/parallel.file\\\>fire.file;ssh parallel@parallel-server2 rm -f /tmp/parallel.file7.file; exit $_EXIT_status;
-file7
-file>fire
-rsync -rlDzRE -essh ./tmp/parallel.file/sub\ dir.file parallel@parallel-server2:./;rsync -rlDzRE -essh /tmp/parallel.file17.file parallel@parallel-server2:/;ssh parallel@parallel-server2 cat\ /tmp/parallel.file17.file\ tmp/parallel.file/./sub\\\ dir.file;_EXIT_status=$?; ssh parallel@parallel-server2 rm -f tmp/parallel.file/./sub\\\ dir.file;ssh parallel@parallel-server2 rm -f /tmp/parallel.file17.file; exit $_EXIT_status;
-file17
-file/./sub dir
-rsync -rlDzRE -essh ./tmp/parallel.file\ :\ \&\ \)\ \\n\*.jpg.file parallel@parallel-server2:./;rsync -rlDzRE -essh /tmp/parallel.file18.file parallel@parallel-server2:/;ssh parallel@parallel-server2 cat\ /tmp/parallel.file18.file\ tmp/parallel.file\\\ :\\\ \\\&\\\ \\\)\\\ \\\\n\\\*.jpg.file;_EXIT_status=$?; ssh parallel@parallel-server2 rm -f tmp/parallel.file\\\ :\\\ \\\&\\\ \\\)\\\ \\\\n\\\*.jpg.file;ssh parallel@parallel-server2 rm -f /tmp/parallel.file18.file; exit $_EXIT_status;
-file18
-file : & ) \n*.jpg
 rsync -rlDzRE -essh ./tmp/parallel.file10.file parallel@parallel-server2:./;rsync -rlDzRE -essh /tmp/parallel.file19.file parallel@parallel-server2:/;ssh parallel@parallel-server2 cat\ /tmp/parallel.file19.file\ tmp/parallel.file10.file;_EXIT_status=$?; ssh parallel@parallel-server2 rm -f tmp/parallel.file10.file;ssh parallel@parallel-server2 rm -f /tmp/parallel.file19.file; exit $_EXIT_status;
 file19
 file10
+rsync -rlDzRE -essh ./tmp/parallel.file\ :\ \&\ \)\ \\n\*.jpg.file parallel@parallel-server2:./;rsync -rlDzRE -essh /tmp/parallel.file18.file parallel@parallel-server2:/;ssh parallel@parallel-server2 cat\ /tmp/parallel.file18.file\ tmp/parallel.file\\\ :\\\ \\\&\\\ \\\)\\\ \\\\n\\\*.jpg.file;_EXIT_status=$?; ssh parallel@parallel-server2 rm -f tmp/parallel.file\\\ :\\\ \\\&\\\ \\\)\\\ \\\\n\\\*.jpg.file;ssh parallel@parallel-server2 rm -f /tmp/parallel.file18.file; exit $_EXIT_status;
+file18
+file : & ) \n*.jpg
+rsync -rlDzRE -essh ./tmp/parallel.file/sub\ dir.file parallel@parallel-server2:./;rsync -rlDzRE -essh /tmp/parallel.file17.file parallel@parallel-server2:/;ssh parallel@parallel-server2 cat\ /tmp/parallel.file17.file\ tmp/parallel.file/./sub\\\ dir.file;_EXIT_status=$?; ssh parallel@parallel-server2 rm -f tmp/parallel.file/./sub\\\ dir.file;ssh parallel@parallel-server2 rm -f /tmp/parallel.file17.file; exit $_EXIT_status;
+file17
+file/./sub dir
 rsync -rlDzRE -essh ./tmp/parallel.file13.file parallel@parallel-server2:./;rsync -rlDzRE -essh /tmp/parallel.file16.file parallel@parallel-server2:/;ssh parallel@parallel-server2 cat\ /tmp/parallel.file16.file\ tmp/parallel.file13.file;_EXIT_status=$?; ssh parallel@parallel-server2 rm -f tmp/parallel.file13.file;ssh parallel@parallel-server2 rm -f /tmp/parallel.file16.file; exit $_EXIT_status;
 file16
 file13
@@ -626,9 +626,9 @@ file17
 rsync -rlDzRE -essh ./tmp/parallel.file18.file parallel@parallel-server2:./;rsync -rlDzRE -essh /tmp/parallel.file1.file parallel@parallel-server2:/;ssh parallel@parallel-server2 cat\ /tmp/parallel.file1.file\ tmp/parallel.file18.file;_EXIT_status=$?; ssh parallel@parallel-server2 rm -f tmp/parallel.file18.file;ssh parallel@parallel-server2 rm -f /tmp/parallel.file1.file; exit $_EXIT_status;
 file1
 file18
-rsync -rlDzRE -essh ./tmp/parallel.file20.file parallel@parallel-server2:./;rsync -rlDzRE -essh /tmp/parallel.file\ :\ \&\ \)\ \\n\*.jpg.file parallel@parallel-server2:/;ssh parallel@parallel-server2 cat\ /tmp/parallel.file\\\ :\\\ \\\&\\\ \\\)\\\ \\\\n\\\*.jpg.file\ tmp/parallel.file20.file;_EXIT_status=$?; ssh parallel@parallel-server2 rm -f tmp/parallel.file20.file;ssh parallel@parallel-server2 rm -f /tmp/parallel.file\\\ :\\\ \\\&\\\ \\\)\\\ \\\\n\\\*.jpg.file; exit $_EXIT_status;
-file : & ) \n*.jpg
-file20
 rsync -rlDzRE -essh ./tmp/parallel.file19.file parallel@parallel-server2:./;rsync -rlDzRE -essh /tmp/parallel.file/sub\ dir.file parallel@parallel-server2:/;ssh parallel@parallel-server2 cat\ /tmp/parallel.file/./sub\\\ dir.file\ tmp/parallel.file19.file;_EXIT_status=$?; ssh parallel@parallel-server2 rm -f tmp/parallel.file19.file;ssh parallel@parallel-server2 rm -f /tmp/parallel.file/./sub\\\ dir.file; exit $_EXIT_status;
 file/./sub dir
 file19
+rsync -rlDzRE -essh ./tmp/parallel.file20.file parallel@parallel-server2:./;rsync -rlDzRE -essh /tmp/parallel.file\ :\ \&\ \)\ \\n\*.jpg.file parallel@parallel-server2:/;ssh parallel@parallel-server2 cat\ /tmp/parallel.file\\\ :\\\ \\\&\\\ \\\)\\\ \\\\n\\\*.jpg.file\ tmp/parallel.file20.file;_EXIT_status=$?; ssh parallel@parallel-server2 rm -f tmp/parallel.file20.file;ssh parallel@parallel-server2 rm -f /tmp/parallel.file\\\ :\\\ \\\&\\\ \\\)\\\ \\\\n\\\*.jpg.file; exit $_EXIT_status;
+file : & ) \n*.jpg
+file20