diff --git a/src/Makefile.am b/src/Makefile.am index 217d9873..8a292a85 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,57 +2,69 @@ bin_SCRIPTS = parallel sem sql niceload man_MANS = parallel.1 sem.1 sql.1 niceload.1 parallel_tutorial.1 doc_DATA = parallel.html sem.html sql.html niceload.html parallel_tutorial.html parallel.texi sem.texi sql.texi niceload.texi parallel_tutorial.texi parallel.pdf sem.pdf sql.pdf niceload.pdf parallel_tutorial.pdf -parallel.1: parallel.pod Makefile +# Build documentation file if the tool to build exists. +# Otherwise: Use the distributed version +parallel.1: parallel.pod pod2man --release='$(PACKAGE_VERSION)' --center='$(PACKAGE_NAME)' \ - --section=1 $(srcdir)/parallel.pod > $(srcdir)/parallel.1 \ + --section=1 $(srcdir)/parallel.pod > $(srcdir)/parallel.1n \ + && mv $(srcdir)/parallel.1n $(srcdir)/parallel.1 \ || echo "Warning: pod2man not found. Using old parallel.1" -parallel_tutorial.1: parallel_tutorial.pod Makefile +parallel_tutorial.1: parallel_tutorial.pod pod2man --release='$(PACKAGE_VERSION)' --center='$(PACKAGE_NAME)' \ - --section=1 $(srcdir)/parallel_tutorial.pod > $(srcdir)/parallel_tutorial.1 \ + --section=1 $(srcdir)/parallel_tutorial.pod > $(srcdir)/parallel_tutorial.1n \ + && mv $(srcdir)/parallel_tutorial.1n $(srcdir)/parallel_tutorial.1 \ || echo "Warning: pod2man not found. Using old parallel_tutorial.1" -sem.1: sem.pod Makefile +sem.1: sem.pod pod2man --release='$(PACKAGE_VERSION)' --center='$(PACKAGE_NAME)' \ - --section=1 $(srcdir)/sem.pod > $(srcdir)/sem.1 \ + --section=1 $(srcdir)/sem.pod > $(srcdir)/sem.1n \ + && mv $(srcdir)/sem.1n $(srcdir)/sem.1 \ || echo "Warning: pod2man not found. Using old sem.1" -sql.1: sql Makefile +sql.1: sql pod2man --release='$(PACKAGE_VERSION)' --center='$(PACKAGE_NAME)' \ - --section=1 $(srcdir)/sql > $(srcdir)/sql.1 \ + --section=1 $(srcdir)/sql > $(srcdir)/sql.1n \ + && mv $(srcdir)/sql.1n $(srcdir)/sql.1 \ || echo "Warning: pod2man not found. Using old sql.1" -niceload.1: niceload.pod Makefile +niceload.1: niceload.pod pod2man --release='$(PACKAGE_VERSION)' --center='$(PACKAGE_NAME)' \ - --section=1 $(srcdir)/niceload.pod > $(srcdir)/niceload.1 \ + --section=1 $(srcdir)/niceload.pod > $(srcdir)/niceload.1n \ + && mv $(srcdir)/niceload.1n $(srcdir)/niceload.1 \ || echo "Warning: pod2man not found. Using old niceload.1" -parallel.html: parallel.pod Makefile - pod2html $(srcdir)/parallel.pod > $(srcdir)/parallel.html \ +parallel.html: parallel.pod + pod2html $(srcdir)/parallel.pod > $(srcdir)/parallel.htmln \ + && mv $(srcdir)/parallel.htmln $(srcdir)/parallel.html \ || echo "Warning: pod2html not found. Using old parallel.html" rm -f $(srcdir)/pod2htm* # Depending on parallel.html to avoid stupid pod2html race condition -parallel_tutorial.html: parallel_tutorial.pod Makefile parallel.html - pod2html $(srcdir)/parallel_tutorial.pod > $(srcdir)/parallel_tutorial.html \ +parallel_tutorial.html: parallel_tutorial.pod parallel.html + pod2html $(srcdir)/parallel_tutorial.pod > $(srcdir)/parallel_tutorial.htmln \ + && mv $(srcdir)/parallel_tutorial.htmln $(srcdir)/parallel_tutorial.html \ || echo "Warning: pod2html not found. Using old parallel_tutorial.html" rm -f $(srcdir)/pod2htm* # Depending on parallel_tutorial.html to avoid stupid pod2html race condition -sem.html: sem.pod Makefile parallel_tutorial.html - pod2html $(srcdir)/sem.pod > $(srcdir)/sem.html \ +sem.html: sem.pod parallel_tutorial.html + pod2html $(srcdir)/sem.pod > $(srcdir)/sem.htmln \ + && mv $(srcdir)/sem.htmln $(srcdir)/sem.html \ || echo "Warning: pod2html not found. Using old sem.html" rm -f $(srcdir)/pod2htm* # Depending on sem.html to avoid stupid pod2html race condition -sql.html: sql Makefile sem.html - pod2html $(srcdir)/sql > $(srcdir)/sql.html \ +sql.html: sql sem.html + pod2html $(srcdir)/sql > $(srcdir)/sql.htmln \ + && mv $(srcdir)/sql.htmln $(srcdir)/sql.html \ || echo "Warning: pod2html not found. Using old sql.html" rm -f $(srcdir)/pod2htm* # Depending on sql.html to avoid stupid pod2html race condition -niceload.html: niceload.pod Makefile sql.html - pod2html $(srcdir)/niceload.pod > $(srcdir)/niceload.html \ +niceload.html: niceload.pod sql.html + pod2html $(srcdir)/niceload.pod > $(srcdir)/niceload.htmln \ + && mv $(srcdir)/niceload.htmln $(srcdir)/niceload.html \ || echo "Warning: pod2html not found. Using old niceload.html" rm -f $(srcdir)/pod2htm* @@ -99,7 +111,7 @@ niceload.pdf: niceload.pod sem: parallel ln -fs parallel sem -DISTCLEANFILES = parallel.html sem.html sql.html niceload.html parallel_tutorial.html +DISTCLEANFILES = EXTRA_DIST = parallel sem sql niceload \ parallel.1 sem.1 sql.1 niceload.1 parallel_tutorial.1 \ parallel.html sem.html sql.html niceload.html parallel_tutorial.html \ diff --git a/src/Makefile.in b/src/Makefile.in index 78dfc4ef..8db8b3dd 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -177,7 +177,7 @@ top_srcdir = @top_srcdir@ bin_SCRIPTS = parallel sem sql niceload man_MANS = parallel.1 sem.1 sql.1 niceload.1 parallel_tutorial.1 doc_DATA = parallel.html sem.html sql.html niceload.html parallel_tutorial.html parallel.texi sem.texi sql.texi niceload.texi parallel_tutorial.texi parallel.pdf sem.pdf sql.pdf niceload.pdf parallel_tutorial.pdf -DISTCLEANFILES = parallel.html sem.html sql.html niceload.html parallel_tutorial.html +DISTCLEANFILES = EXTRA_DIST = parallel sem sql niceload \ parallel.1 sem.1 sql.1 niceload.1 parallel_tutorial.1 \ parallel.html sem.html sql.html niceload.html parallel_tutorial.html \ @@ -489,57 +489,69 @@ uninstall-man: uninstall-man1 uninstall-man1 -parallel.1: parallel.pod Makefile +# Build documentation file if the tool to build exists. +# Otherwise: Use the distributed version +parallel.1: parallel.pod pod2man --release='$(PACKAGE_VERSION)' --center='$(PACKAGE_NAME)' \ - --section=1 $(srcdir)/parallel.pod > $(srcdir)/parallel.1 \ + --section=1 $(srcdir)/parallel.pod > $(srcdir)/parallel.1n \ + && mv $(srcdir)/parallel.1n $(srcdir)/parallel.1 \ || echo "Warning: pod2man not found. Using old parallel.1" -parallel_tutorial.1: parallel_tutorial.pod Makefile +parallel_tutorial.1: parallel_tutorial.pod pod2man --release='$(PACKAGE_VERSION)' --center='$(PACKAGE_NAME)' \ - --section=1 $(srcdir)/parallel_tutorial.pod > $(srcdir)/parallel_tutorial.1 \ + --section=1 $(srcdir)/parallel_tutorial.pod > $(srcdir)/parallel_tutorial.1n \ + && mv $(srcdir)/parallel_tutorial.1n $(srcdir)/parallel_tutorial.1 \ || echo "Warning: pod2man not found. Using old parallel_tutorial.1" -sem.1: sem.pod Makefile +sem.1: sem.pod pod2man --release='$(PACKAGE_VERSION)' --center='$(PACKAGE_NAME)' \ - --section=1 $(srcdir)/sem.pod > $(srcdir)/sem.1 \ + --section=1 $(srcdir)/sem.pod > $(srcdir)/sem.1n \ + && mv $(srcdir)/sem.1n $(srcdir)/sem.1 \ || echo "Warning: pod2man not found. Using old sem.1" -sql.1: sql Makefile +sql.1: sql pod2man --release='$(PACKAGE_VERSION)' --center='$(PACKAGE_NAME)' \ --section=1 $(srcdir)/sql > $(srcdir)/sql.1 \ + && mv $(srcdir)/sql.1n $(srcdir)/sql.1 \ || echo "Warning: pod2man not found. Using old sql.1" -niceload.1: niceload.pod Makefile +niceload.1: niceload.pod pod2man --release='$(PACKAGE_VERSION)' --center='$(PACKAGE_NAME)' \ --section=1 $(srcdir)/niceload.pod > $(srcdir)/niceload.1 \ + && mv $(srcdir)/niceload.1n $(srcdir)/niceload.1 \ || echo "Warning: pod2man not found. Using old niceload.1" -parallel.html: parallel.pod Makefile - pod2html $(srcdir)/parallel.pod > $(srcdir)/parallel.html \ +parallel.html: parallel.pod + pod2html $(srcdir)/parallel.pod > $(srcdir)/parallel.htmln \ + && mv $(srcdir)/parallel.htmln $(srcdir)/parallel.html \ || echo "Warning: pod2html not found. Using old parallel.html" rm -f $(srcdir)/pod2htm* # Depending on parallel.html to avoid stupid pod2html race condition parallel_tutorial.html: parallel_tutorial.pod Makefile parallel.html - pod2html $(srcdir)/parallel_tutorial.pod > $(srcdir)/parallel_tutorial.html \ + pod2html $(srcdir)/parallel_tutorial.pod > $(srcdir)/parallel_tutorial.htmln \ + && mv $(srcdir)/parallel_tutorial.htmln $(srcdir)/parallel_tutorial.html \ || echo "Warning: pod2html not found. Using old parallel_tutorial.html" rm -f $(srcdir)/pod2htm* # Depending on parallel_tutorial.html to avoid stupid pod2html race condition -sem.html: sem.pod Makefile parallel_tutorial.html - pod2html $(srcdir)/sem.pod > $(srcdir)/sem.html \ +sem.html: sem.pod parallel_tutorial.html + pod2html $(srcdir)/sem.pod > $(srcdir)/sem.htmln \ + && mv $(srcdir)/sem.htmln $(srcdir)/sem.html \ || echo "Warning: pod2html not found. Using old sem.html" rm -f $(srcdir)/pod2htm* # Depending on sem.html to avoid stupid pod2html race condition -sql.html: sql Makefile sem.html - pod2html $(srcdir)/sql > $(srcdir)/sql.html \ +sql.html: sql sem.html + pod2html $(srcdir)/sql > $(srcdir)/sql.htmln \ + && mv $(srcdir)/sql.htmln $(srcdir)/sql.html \ || echo "Warning: pod2html not found. Using old sql.html" rm -f $(srcdir)/pod2htm* # Depending on sql.html to avoid stupid pod2html race condition -niceload.html: niceload.pod Makefile sql.html - pod2html $(srcdir)/niceload.pod > $(srcdir)/niceload.html \ +niceload.html: niceload.pod sql.html + pod2html $(srcdir)/niceload.pod > $(srcdir)/niceload.htmln \ + && mv $(srcdir)/niceload.htmln $(srcdir)/niceload.html \ || echo "Warning: pod2html not found. Using old niceload.html" rm -f $(srcdir)/pod2htm* diff --git a/src/niceload b/src/niceload index b050ee76..d638e619 100755 --- a/src/niceload +++ b/src/niceload @@ -24,7 +24,7 @@ use strict; use Getopt::Long; $Global::progname="niceload"; -$Global::version = 20140522; +$Global::version = 20140613; Getopt::Long::Configure("bundling","require_order"); get_options_from_array(\@ARGV) || die_usage(); if($opt::version) { diff --git a/src/parallel b/src/parallel index ae966e58..86d5a859 100755 --- a/src/parallel +++ b/src/parallel @@ -748,7 +748,7 @@ sub get_options_from_array { sub parse_options { # Returns: N/A # Defaults: - $Global::version = 20140522; + $Global::version = 20140613; $Global::progname = 'parallel'; $Global::infinity = 2**31; $Global::debug = 0; diff --git a/src/parallel.pdf b/src/parallel.pdf index e18bd263..cb6e740e 100644 Binary files a/src/parallel.pdf and b/src/parallel.pdf differ diff --git a/src/parallel.pod b/src/parallel.pod index 7f4f2add..6ed228f6 100644 --- a/src/parallel.pod +++ b/src/parallel.pod @@ -2328,6 +2328,10 @@ If the login username is I on I use: seq 10 | parallel --sshlogin server.example.com \ --sshlogin foo@server2.example.net echo +If your list of hosts is I with login I: + + seq 10 | parallel -Sfoo@server{1..88}.example.net echo + To distribute the commands to a list of computers, make a file I with all the computers: diff --git a/src/parallel.texi b/src/parallel.texi index c165be59..19911a59 100644 --- a/src/parallel.texi +++ b/src/parallel.texi @@ -2562,6 +2562,12 @@ If the login username is @emph{foo} on @emph{server2.example.net} use: --sshlogin foo@server2.example.net echo @end verbatim +If your list of hosts is @emph{server1-88.example.net} with login @emph{foo}: + +@verbatim + seq 10 | parallel -Sfoo@server{1..88}.example.net echo +@end verbatim + To distribute the commands to a list of computers, make a file @emph{mycomputers} with all the computers: diff --git a/src/parallel_tutorial.1 b/src/parallel_tutorial.1 index d84cc4e6..d33ff31d 100644 --- a/src/parallel_tutorial.1 +++ b/src/parallel_tutorial.1 @@ -124,7 +124,7 @@ .\" ======================================================================== .\" .IX Title "PARALLEL_TUTORIAL 1" -.TH PARALLEL_TUTORIAL 1 "2014-06-04" "20140522" "parallel" +.TH PARALLEL_TUTORIAL 1 "2014-06-13" "20140522" "parallel" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/src/sql b/src/sql index 82aa5a56..2e5fd4e2 100755 --- a/src/sql +++ b/src/sql @@ -566,7 +566,7 @@ $Global::Initfile && unlink $Global::Initfile; exit ($err); sub parse_options { - $Global::version = 20140522; + $Global::version = 20140613; $Global::progname = 'sql'; # This must be done first as this may exec myself diff --git a/src/sql.pdf b/src/sql.pdf index aecf8d06..0f5f166c 100644 Binary files a/src/sql.pdf and b/src/sql.pdf differ