From b4a51e40ee347f1673d0be6a8b634a8a60c14596 Mon Sep 17 00:00:00 2001 From: Ole Tange Date: Mon, 14 Mar 2011 17:37:30 +0100 Subject: [PATCH] parallel: Allow -E 0 and -i 0 Documentation changes --- doc/FUTURE_IDEAS | 4 ++++ doc/release_new_version | 17 ++++++++++++++--- packager/debian/doc/index.html | 2 ++ src/parallel | 9 ++++++--- src/parallel.pod | 19 +++++++++++++++---- 5 files changed, 41 insertions(+), 10 deletions(-) diff --git a/doc/FUTURE_IDEAS b/doc/FUTURE_IDEAS index b30909ce..d3ba5e72 100644 --- a/doc/FUTURE_IDEAS +++ b/doc/FUTURE_IDEAS @@ -246,6 +246,10 @@ parallel -mj1 sort -nm {} ";"rm {} # If GNU Parallel saves you money: # * (Have your company) donate to FSF https://my.fsf.org/donate/ # +# If you use GNU Parallel for a publication please cite: +# O. Tange (2011): GNU Parallel - The Command-Line Power Tool, ;login: +# The USENIX Magazine, February 2011:42-47. +# # Find GNU Parallel at http://www.gnu.org/software/parallel/ diff --git a/doc/release_new_version b/doc/release_new_version index 54f414e3..15e2ab45 100644 --- a/doc/release_new_version +++ b/doc/release_new_version @@ -159,9 +159,9 @@ New in this release: By putting --tollef in the site wide config file you can deinstall Tollef's parallel and install GNU Parallel instead without any - change for users or scripts. This is useful for packagers that do - not distribute GNU Parallel because the command name conflicts with - Tollef's parallel. + change for users or scripts. This is useful for packagers that + currently do not distribute GNU Parallel because the command name + conflicts with Tollef's parallel. * -L 0 -n 0, and -N 0 implemented. They will read one argument, but insert 0 arguments on the command line. Useful if you just want @@ -176,6 +176,10 @@ New in this release: * Man page examples translated into Japanese. Thanks to Koshigoe. http://w.koshigoe.jp/study/?%5Bsystem%5D+GNU+parallel+%BB%C8%CD%D1%CE%E3#l13 +* Video of presentation from FSCONS 2010-11-07. The presenter was + _really_ hoarse that day (Something to do with loads of alcohol the + night before). http://vimeo.com/20838834 + * Review with examples in German. Thanks to M. Nieberg. http://kenntwas.de/2011/linux/gnu-parallel/ @@ -188,6 +192,9 @@ New in this release: * Using GNU Parallel instead of xargs. Thanks to James Cuff. http://blog.jcuff.net/2011/02/on-train-ride-in.html +* Using GNU Parallel from 0install (German). Thanks to AdaMin. + http://forum.ubuntuusers.de/topic/gnu-parallel-mit-zero-install-kurzinfo-kein-wi/ + * Bug fixes and man page updates. @@ -217,4 +224,8 @@ http://www.gnu.org/software/parallel/ Watch the intro video on http://www.youtube.com/watch?v=OpaiGYxkSuQ or at http://tinyogg.com/watch/TORaR/ and http://tinyogg.com/watch/hfxKj/ +When using GNU Parallel for a publication please cite: + +O. Tange (2011): GNU Parallel - The Command-Line Power Tool, ;login: +The USENIX Magazine, February 2011:42-47. >>>>> diff --git a/packager/debian/doc/index.html b/packager/debian/doc/index.html index be638474..0e7b9cb1 100644 --- a/packager/debian/doc/index.html +++ b/packager/debian/doc/index.html @@ -49,6 +49,8 @@ average is checked again and we start over.

Author

+

When using GNU Parallel for a publication please cite:

+

O. Tange (2011): GNU Parallel - The Command-Line Power Tool, ;login: The USENIX Magazine, February 2011:42-47.

Copyright (C) 2007-10-18 Ole Tange, http://ole.tange.dk

Copyright (C) 2008,2009,2010 Ole Tange, http://ole.tange.dk

Copyright (C) 2010,2011 Ole Tange, http://ole.tange.dk and Free diff --git a/src/parallel b/src/parallel index f52ac200..288ea1b6 100755 --- a/src/parallel +++ b/src/parallel @@ -423,12 +423,12 @@ sub parse_options { if(defined $::opt_verbose) { $Global::stderr_verbose = 1; } if(defined $::opt_I) { $Global::replace{'{}'} = $::opt_I; } if(defined $::opt_U) { $Global::replace{'{.}'} = $::opt_U; } - if(defined $::opt_i and $::opt_i) { $Global::replace{'{}'} = $::opt_i; } + if(defined $::opt_i) { $Global::replace{'{}'} = $::opt_i; } if(defined $::opt_basenamereplace) { $Global::replace{'{/}'} = $::opt_basenamereplace; } if(defined $::opt_basenameextensionreplace) { $Global::replace{'{/.}'} = $::opt_basenameextensionreplace; } - if(defined $::opt_E and $::opt_E) { $Global::end_of_file_string = $::opt_E; } + if(defined $::opt_E) { $Global::end_of_file_string = $::opt_E; } if(defined $::opt_n) { $Global::max_number_of_args = $::opt_n; } if(defined $::opt_N) { $Global::max_number_of_args = $::opt_N; } if(defined $::opt_tmpdir) { $ENV{'TMPDIR'} = $::opt_tmpdir; } @@ -1538,7 +1538,10 @@ sub version { "This is free software: you are free to change and redistribute it.", "GNU $Global::progname comes with no warranty.", "", - "Web site: http://www.gnu.org/software/${Global::progname}\n" + "Web site: http://www.gnu.org/software/${Global::progname}\n", + "When using GNU Parallel for a publication please cite:\n", + "O. Tange (2011): GNU Parallel - The Command-Line Power Tool, ", + ";login: The USENIX Magazine, February 2011:42-47.\n", ); } diff --git a/src/parallel.pod b/src/parallel.pod index 1cdbd01e..bf691788 100644 --- a/src/parallel.pod +++ b/src/parallel.pod @@ -2611,11 +2611,16 @@ B Because of the way newline is quoted this will not work: -echo 1,2,3 | parallel -vkd, "echo 'a{}'" +echo 1,2,3 | parallel -vkd, "echo 'a{}b'" -However, this will work: +However, these will all work: + +echo 1,2,3 | parallel -vkd, echo a{}b + +echo 1,2,3 | parallel -vkd, "echo 'a'{}'b'" + +echo 1,2,3 | parallel -vkd, "echo 'a'"{}"'b'" -echo 1,2,3 | parallel -vkd, echo a{} =head2 Startup speed @@ -2639,11 +2644,17 @@ you file a bug-report. =head1 REPORTING BUGS -Report bugs to or https://savannah.gnu.org/bugs/?func=additem&group=parallel +Report bugs to or +https://savannah.gnu.org/bugs/?func=additem&group=parallel =head1 AUTHOR +When using GNU Parallel for a publication please cite: + +O. Tange (2011): GNU Parallel - The Command-Line Power Tool, ;login: +The USENIX Magazine, February 2011:42-47. + Copyright (C) 2007-10-18 Ole Tange, http://ole.tange.dk Copyright (C) 2008,2009,2010 Ole Tange, http://ole.tange.dk