From 00d9382abd9cd6842afc274c720f3ab0acf7e175 Mon Sep 17 00:00:00 2001 From: Ole Tange Date: Mon, 26 Apr 2010 13:24:56 +0200 Subject: [PATCH] First GNU release done --- Makefile.in | 2 +- README | 1 + autom4te.cache/output.0 | 30 +++++++-------- autom4te.cache/output.1 | 30 +++++++-------- autom4te.cache/requests | 26 ++++++------- autom4te.cache/traces.1 | 2 +- configure | 30 +++++++-------- configure.ac | 2 +- doc/parallel-directive.asc | 4 ++ doc/release_new_version | 52 +++++++++++++++++++++++++ src/Makefile.am | 1 + src/Makefile.in | 1 + src/parallel | 64 +++++++++++++------------------ unittest/actual-results/test17 | 0 unittest/input-files/test15/1 | 1 + unittest/input-files/test15/2 | 1 + unittest/input-files/test15/3 | 1 + unittest/input-files/test15/files | 2 + unittest/tests-to-run/test17.sh | 7 ++++ 19 files changed, 158 insertions(+), 99 deletions(-) create mode 100644 README create mode 100644 doc/parallel-directive.asc create mode 100644 doc/release_new_version create mode 100644 unittest/actual-results/test17 create mode 100644 unittest/input-files/test15/1 create mode 100644 unittest/input-files/test15/2 create mode 100644 unittest/input-files/test15/3 create mode 100644 unittest/input-files/test15/files create mode 100644 unittest/tests-to-run/test17.sh diff --git a/Makefile.in b/Makefile.in index aa2116f6..20450f37 100644 --- a/Makefile.in +++ b/Makefile.in @@ -32,7 +32,7 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : subdir = . -DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \ +DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(top_srcdir)/configure install-sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 diff --git a/README b/README new file mode 100644 index 00000000..b980d1d7 --- /dev/null +++ b/README @@ -0,0 +1 @@ +./configure; make; make install diff --git a/autom4te.cache/output.0 b/autom4te.cache/output.0 index 062dace9..5a8901b9 100644 --- a/autom4te.cache/output.0 +++ b/autom4te.cache/output.0 @@ -1,8 +1,8 @@ @%:@! /bin/sh @%:@ Guess values for system-dependent variables and create Makefiles. -@%:@ Generated by GNU Autoconf 2.65 for parallel 20100420. +@%:@ Generated by GNU Autoconf 2.65 for parallel 20100424. @%:@ -@%:@ Report bugs to . +@%:@ Report bugs to . @%:@ @%:@ @%:@ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -230,7 +230,7 @@ fi $as_echo "$0: be upgraded to zsh 4.3.4 or later." else $as_echo "$0: Please tell bug-autoconf@gnu.org and -$0: bug-parallel@tange.dk about your system, including any +$0: bug-parallel@gnu.org about your system, including any $0: error possibly output before this message. Then install $0: a modern shell, or manually run the script under such a $0: shell if you do have one." @@ -551,9 +551,9 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='parallel' PACKAGE_TARNAME='parallel' -PACKAGE_VERSION='20100420' -PACKAGE_STRING='parallel 20100420' -PACKAGE_BUGREPORT='bug-parallel@tange.dk' +PACKAGE_VERSION='20100424' +PACKAGE_STRING='parallel 20100424' +PACKAGE_BUGREPORT='bug-parallel@gnu.org' PACKAGE_URL='' ac_subst_vars='LTLIBOBJS @@ -1167,7 +1167,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures parallel 20100420 to adapt to many kinds of systems. +\`configure' configures parallel 20100424 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1233,11 +1233,11 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of parallel 20100420:";; + short | recursive ) echo "Configuration of parallel 20100424:";; esac cat <<\_ACEOF -Report bugs to . +Report bugs to . _ACEOF ac_status=$? fi @@ -1300,7 +1300,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -parallel configure 20100420 +parallel configure 20100424 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -1317,7 +1317,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by parallel $as_me 20100420, which was +It was created by parallel $as_me 20100424, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2125,7 +2125,7 @@ fi # Define the identity of the package. PACKAGE='parallel' - VERSION='20100420' + VERSION='20100424' cat >>confdefs.h <<_ACEOF @@ -2675,7 +2675,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by parallel $as_me 20100420, which was +This file was extended by parallel $as_me 20100424, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2731,13 +2731,13 @@ $config_files Configuration headers: $config_headers -Report bugs to ." +Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -parallel config.status 20100420 +parallel config.status 20100424 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff --git a/autom4te.cache/output.1 b/autom4te.cache/output.1 index 062dace9..5a8901b9 100644 --- a/autom4te.cache/output.1 +++ b/autom4te.cache/output.1 @@ -1,8 +1,8 @@ @%:@! /bin/sh @%:@ Guess values for system-dependent variables and create Makefiles. -@%:@ Generated by GNU Autoconf 2.65 for parallel 20100420. +@%:@ Generated by GNU Autoconf 2.65 for parallel 20100424. @%:@ -@%:@ Report bugs to . +@%:@ Report bugs to . @%:@ @%:@ @%:@ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -230,7 +230,7 @@ fi $as_echo "$0: be upgraded to zsh 4.3.4 or later." else $as_echo "$0: Please tell bug-autoconf@gnu.org and -$0: bug-parallel@tange.dk about your system, including any +$0: bug-parallel@gnu.org about your system, including any $0: error possibly output before this message. Then install $0: a modern shell, or manually run the script under such a $0: shell if you do have one." @@ -551,9 +551,9 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='parallel' PACKAGE_TARNAME='parallel' -PACKAGE_VERSION='20100420' -PACKAGE_STRING='parallel 20100420' -PACKAGE_BUGREPORT='bug-parallel@tange.dk' +PACKAGE_VERSION='20100424' +PACKAGE_STRING='parallel 20100424' +PACKAGE_BUGREPORT='bug-parallel@gnu.org' PACKAGE_URL='' ac_subst_vars='LTLIBOBJS @@ -1167,7 +1167,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures parallel 20100420 to adapt to many kinds of systems. +\`configure' configures parallel 20100424 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1233,11 +1233,11 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of parallel 20100420:";; + short | recursive ) echo "Configuration of parallel 20100424:";; esac cat <<\_ACEOF -Report bugs to . +Report bugs to . _ACEOF ac_status=$? fi @@ -1300,7 +1300,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -parallel configure 20100420 +parallel configure 20100424 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -1317,7 +1317,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by parallel $as_me 20100420, which was +It was created by parallel $as_me 20100424, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2125,7 +2125,7 @@ fi # Define the identity of the package. PACKAGE='parallel' - VERSION='20100420' + VERSION='20100424' cat >>confdefs.h <<_ACEOF @@ -2675,7 +2675,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by parallel $as_me 20100420, which was +This file was extended by parallel $as_me 20100424, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2731,13 +2731,13 @@ $config_files Configuration headers: $config_headers -Report bugs to ." +Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -parallel config.status 20100420 +parallel config.status 20100424 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff --git a/autom4te.cache/requests b/autom4te.cache/requests index 8e58b38e..0cc71478 100644 --- a/autom4te.cache/requests +++ b/autom4te.cache/requests @@ -64,8 +64,8 @@ 'AM_SET_LEADING_DOT' => 1, 'AM_SET_DEPDIR' => 1, '_AM_DEPENDENCIES' => 1, - 'm4_include' => 1, 'AM_PROG_INSTALL_SH' => 1, + 'm4_include' => 1, '_AC_AM_CONFIG_HEADER_HOOK' => 1, 'AU_DEFUN' => 1, 'AM_MAKE_INCLUDE' => 1 @@ -83,25 +83,25 @@ 'configure.ac' ], { - 'AM_PROG_F77_C_O' => 1, '_LT_AC_TAGCONFIG' => 1, - 'AC_INIT' => 1, + 'AM_PROG_F77_C_O' => 1, 'm4_pattern_forbid' => 1, - 'AC_CANONICAL_TARGET' => 1, + 'AC_INIT' => 1, '_AM_COND_IF' => 1, - 'AC_CONFIG_LIBOBJ_DIR' => 1, + 'AC_CANONICAL_TARGET' => 1, 'AC_SUBST' => 1, - 'AC_CANONICAL_HOST' => 1, + 'AC_CONFIG_LIBOBJ_DIR' => 1, 'AC_FC_SRCEXT' => 1, + 'AC_CANONICAL_HOST' => 1, 'AC_PROG_LIBTOOL' => 1, 'AM_INIT_AUTOMAKE' => 1, 'AC_CONFIG_SUBDIRS' => 1, 'AM_AUTOMAKE_VERSION' => 1, 'LT_CONFIG_LTDL_DIR' => 1, - 'AC_CONFIG_LINKS' => 1, 'AC_REQUIRE_AUX_FILE' => 1, - 'LT_SUPPORTED_TAG' => 1, + 'AC_CONFIG_LINKS' => 1, 'm4_sinclude' => 1, + 'LT_SUPPORTED_TAG' => 1, 'AM_MAINTAINER_MODE' => 1, 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, '_m4_warn' => 1, @@ -114,17 +114,17 @@ 'include' => 1, 'AM_GNU_GETTEXT' => 1, 'AC_LIBSOURCE' => 1, - 'AC_CANONICAL_BUILD' => 1, 'AM_PROG_FC_C_O' => 1, + 'AC_CANONICAL_BUILD' => 1, 'AC_FC_FREEFORM' => 1, 'AH_OUTPUT' => 1, - 'AC_CONFIG_AUX_DIR' => 1, '_AM_SUBST_NOTMAKE' => 1, - 'AM_PROG_CC_C_O' => 1, - 'm4_pattern_allow' => 1, + 'AC_CONFIG_AUX_DIR' => 1, 'sinclude' => 1, - 'AM_CONDITIONAL' => 1, + 'm4_pattern_allow' => 1, + 'AM_PROG_CC_C_O' => 1, 'AC_CANONICAL_SYSTEM' => 1, + 'AM_CONDITIONAL' => 1, 'AC_CONFIG_HEADERS' => 1, 'AC_DEFINE_TRACE_LITERAL' => 1, 'm4_include' => 1, diff --git a/autom4te.cache/traces.1 b/autom4te.cache/traces.1 index 0b71ba22..fea07719 100644 --- a/autom4te.cache/traces.1 +++ b/autom4te.cache/traces.1 @@ -1,4 +1,4 @@ -m4trace:configure.ac:1: -1- AC_INIT([parallel], [20100420], [bug-parallel@tange.dk]) +m4trace:configure.ac:1: -1- AC_INIT([parallel], [20100424], [bug-parallel@gnu.org]) m4trace:configure.ac:1: -1- m4_pattern_forbid([^_?A[CHUM]_]) m4trace:configure.ac:1: -1- m4_pattern_forbid([_AC_]) m4trace:configure.ac:1: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS']) diff --git a/configure b/configure index ece508bb..f2cc2f2c 100755 --- a/configure +++ b/configure @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for parallel 20100420. +# Generated by GNU Autoconf 2.65 for parallel 20100424. # -# Report bugs to . +# Report bugs to . # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -230,7 +230,7 @@ fi $as_echo "$0: be upgraded to zsh 4.3.4 or later." else $as_echo "$0: Please tell bug-autoconf@gnu.org and -$0: bug-parallel@tange.dk about your system, including any +$0: bug-parallel@gnu.org about your system, including any $0: error possibly output before this message. Then install $0: a modern shell, or manually run the script under such a $0: shell if you do have one." @@ -551,9 +551,9 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='parallel' PACKAGE_TARNAME='parallel' -PACKAGE_VERSION='20100420' -PACKAGE_STRING='parallel 20100420' -PACKAGE_BUGREPORT='bug-parallel@tange.dk' +PACKAGE_VERSION='20100424' +PACKAGE_STRING='parallel 20100424' +PACKAGE_BUGREPORT='bug-parallel@gnu.org' PACKAGE_URL='' ac_subst_vars='LTLIBOBJS @@ -1167,7 +1167,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures parallel 20100420 to adapt to many kinds of systems. +\`configure' configures parallel 20100424 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1233,11 +1233,11 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of parallel 20100420:";; + short | recursive ) echo "Configuration of parallel 20100424:";; esac cat <<\_ACEOF -Report bugs to . +Report bugs to . _ACEOF ac_status=$? fi @@ -1300,7 +1300,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -parallel configure 20100420 +parallel configure 20100424 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -1317,7 +1317,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by parallel $as_me 20100420, which was +It was created by parallel $as_me 20100424, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2125,7 +2125,7 @@ fi # Define the identity of the package. PACKAGE='parallel' - VERSION='20100420' + VERSION='20100424' cat >>confdefs.h <<_ACEOF @@ -2675,7 +2675,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by parallel $as_me 20100420, which was +This file was extended by parallel $as_me 20100424, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2731,13 +2731,13 @@ $config_files Configuration headers: $config_headers -Report bugs to ." +Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -parallel config.status 20100420 +parallel config.status 20100424 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 68952179..e8b37b23 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([parallel], [20100422], [bug-parallel@gnu.org]) +AC_INIT([parallel], [20100424], [bug-parallel@gnu.org]) AM_INIT_AUTOMAKE([-Wall -Werror foreign]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_FILES([ diff --git a/doc/parallel-directive.asc b/doc/parallel-directive.asc new file mode 100644 index 00000000..bd4c0e17 --- /dev/null +++ b/doc/parallel-directive.asc @@ -0,0 +1,4 @@ +version: 1.1 +directory: parallel +filename: parallel-20100424.tar.bz2 +comment: Initial release of GNU Parallel diff --git a/doc/release_new_version b/doc/release_new_version new file mode 100644 index 00000000..cf6f3141 --- /dev/null +++ b/doc/release_new_version @@ -0,0 +1,52 @@ += Notes on how to release new version = + +== Update version == + +=== configure.ac === +configure.ac: AC_INIT([parallel], [20100422], [bug-parallel@gnu.org]) + +YYYYMMDD=`yyyymmdd` +perl -i -pe "s/20\d\d\d\d\d\d/$YYYYMMDD/" configure.ac + +=== src/parallel === + +src/parallel: $Global::version = 20100422; + +YYYYMMDD=`yyyymmdd` +perl -i -pe "/version/ and s/20\d\d\d\d\d\d/$YYYYMMDD/" src/parallel + +=== directive file for ftp === + +YYYYMMDD=`yyyymmdd` +perl -i -pe "/version/ and s/20\d\d\d\d\d\d/$YYYYMMDD/" parallel-*.tar.*directive.asc + +== Autoconf/automake == + +rm -fr autom4te.cache aclocal.m4 config.h config.h.in config.log Makefile.in missing install-sh +rm -rf src/Makefile.in +autoreconf --install -W gnu +./configure +make + +== Unittest == + +cd unittest; make unittest + +== Package == + +./configure +make dist +make bzip2-dist + +== Upload == + +YYYYMMDD=`yyyymmdd` +cp doc/parallel-directive.asc parallel-$YYYYMMDD.tar.bz2.directive +perl -i -pe "s/20\d\d\d\d\d\d/$YYYYMMDD/" parallel-*.tar.*directive +gpg --clearsign parallel-*.tar.*directive + +YYYYMMDD=`yyyymmdd` +gpg -b parallel-$YYYYMMDD.tar.bz2 + +YYYYMMDD=`yyyymmdd` +echo put parallel-$YYYYMMDD.tar.bz2{,.sig,*asc} | ncftp ftp://ftp-upload.gnu.org/incoming/ftp/ diff --git a/src/Makefile.am b/src/Makefile.am index d80fb71a..cc7e6082 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,3 +6,4 @@ parallel.1: parallel Makefile --section=1 $(srcdir)/parallel > $(srcdir)/parallel.1 DISTCLEANFILES = parallel.1 +EXTRA_DIST = parallel parallel.1 diff --git a/src/Makefile.in b/src/Makefile.in index 7f80b0d9..2e7a78da 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -146,6 +146,7 @@ top_srcdir = @top_srcdir@ bin_SCRIPTS = parallel man_MANS = parallel.1 DISTCLEANFILES = parallel.1 +EXTRA_DIST = parallel parallel.1 all: all-am .SUFFIXES: diff --git a/src/parallel b/src/parallel index 8dc79d25..2ab85cbe 100755 --- a/src/parallel +++ b/src/parallel @@ -54,16 +54,16 @@ not contain B<.> it will remain unchanged. Use NUL as delimiter. Normally input lines will end in \n (newline). If they end in \0 (NUL), then use this option. It is useful -for processing filenames that may contain \n (newline). +for processing arguments that may contain \n (newline). -=item B<--arg-file>=I +=item B<--arg-file>=I -=item B<-a> I +=item B<-a> I -Read items from file instead of standard input. If you use this -option, stdin is given to the first process run. Otherwise, stdin is -redirected from /dev/null. +Read items from the file I instead of standard input. If +you use this option, stdin is given to the first process run. +Otherwise, stdin is redirected from /dev/null. =item B<--cleanup> (not implemented) @@ -271,8 +271,7 @@ with 'y' or 'Y'. Implies B<-t>. =item B<-r> -If the standard input does not contain any nonblanks, do not run the -command. +If the standard input only contains whitespace, do not run the command. =item B<--return> I (not implemented) @@ -283,25 +282,25 @@ from the remote server using B and will be put relative to the default login dir. E.g. echo foo/bar.txt | parallel \ - --sshlogin server.example.com --return {}.out touch {}.out + --sshlogin server.example.com --return {.}.out touch {.}.out -This will transfer the file I<$HOME/foo/bar.txt.out> from the server -I to the file I after running -B on I. +This will transfer the file I<$HOME/foo/bar.out> from the server +I to the file I after running +B on I. echo /tmp/foo/bar.txt | parallel \ - --sshlogin server.example.com --return {}.out touch {}.out + --sshlogin server.example.com --return {.}.out touch {.}.out -This will transfer the file I from the server -I to the file I after running -B on I. +This will transfer the file I from the server +I to the file I after running +B on I. Multiple files can be transfered by repeating the options multiple times: echo /tmp/foo/bar.txt | \ parallel --sshlogin server.example.com \ - --return {}.out --return {}.out2 touch {}.out {}.out2 + --return {.}.out --return {.}.out2 touch {.}.out {.}.out2 B<--return> is often used with B<--transfer> and B<--cleanup>. @@ -312,7 +311,7 @@ B<--return> is ignored when used with B<--sshlogin :> or when not used with B<-- =item B<-s> I -Use at most max-chars characters per command line, including the +Use at most I characters per command line, including the command and initial-arguments and the terminating nulls at the ends of the argument strings. The largest allowed value is system-dependent, and is calculated as the argument length limit for exec, less the size @@ -395,14 +394,14 @@ will be put relative to the default login dir. E.g. --sshlogin server.example.com --transfer wc This will transfer the file I to the server -I to the file $HOME/foo/bar.txt before running +I to the file I<$HOME/foo/bar.txt> before running B on I. echo /tmp/foo/bar.txt | parallel \ --sshlogin server.example.com --transfer wc This will transfer the file I to the server -I to the file /tmp/foo/bar.txt before running +I to the file I before running B on I. B<--transfer> is often used with B<--return> and B<--cleanup>. @@ -414,7 +413,7 @@ B<--transfer> is ignored when used with B<--sshlogin :> or when not used with B< Transfer, Return, Cleanup. Short hand for: - --transfer --return I --cleanup + --transfer --return filename --cleanup =item B<--ungroup> @@ -425,10 +424,10 @@ Ungroup output. Output is printed as soon as possible. This may cause output from different commands to be mixed. Can be reversed with B<-g>. -=item B<-U> I - =item B<--extensionreplace> I +=item B<-U> I + Use the replacement string I instead of {.} for input line without extension. @@ -528,18 +527,7 @@ B Notice how the argument has to start with {} as {} will include path (e.g. running B would clearly be wrong). It will result in files -like ./foo/bar.jpg_thumb.jpg. If that is not wanted this can fix it: - - find . -name '*.jpg' | \ - perl -pe 'chomp; $a=$_; s:/([^/]+)$:/thumb_$1:; $_="convert -geometry 120 $a $_\n"' | \ - parallel -c -j +0 - -Unfortunately this will not work if the filenames contain special -characters (such as space or quotes). If you have B installed this -is a better solution: - - find . -name '*.jpg' | parallel -j +0 convert -geometry 120 {} {}_thumb.jpg - find . -name '*_thumb.jpg' | ren 's:/([^/]+)_thumb.jpg$:/thumb_$1:' +like ./foo/bar.jpg_thumb.jpg. This will make files like ./foo/bar_thumb.jpg: @@ -904,7 +892,7 @@ Copyright (C) 2008,2009,2010 Ole Tange, http://ole.tange.dk Copyright (C) 2010 Ole Tange, http://ole.tange.dk and Free Software Foundation, Inc. -Parts of the manual concerning B compatability is inspired by +Parts of the manual concerning B compatibility is inspired by the manual of B from GNU findutils 4.4.2. @@ -1048,7 +1036,6 @@ $Global::keeporder = 0; $Global::quoting = 0; $Global::replacestring = '{}'; $Global::replace_no_ext = '{.}'; -$Global::input_is_filename = (@ARGV); $/="\n"; $Global::ignore_empty = 0; $Global::argfile = *STDIN; @@ -1103,6 +1090,7 @@ GetOptions("debug|D" => \$::opt_D, "exit|x" => \$::opt_x, ) || die_usage(); $Global::debug = (defined $::opt_D); +$Global::input_is_filename = (@ARGV); if(defined $::opt_m) { $Global::xargs = 1; } if(defined $::opt_X) { $Global::Xargs = 1; } if(defined $::opt_v) { $Global::verbose = 1; } @@ -1927,7 +1915,7 @@ sub version { "This is free software: you are free to change and redistribute it.", "$Global::progname comes with no warranty.", "", - "Web site: http://${Global::progname}.nongnu.org\n" + "Web site: http://www.gnu.org/software/${Global::progname}\n" ); } diff --git a/unittest/actual-results/test17 b/unittest/actual-results/test17 new file mode 100644 index 00000000..e69de29b diff --git a/unittest/input-files/test15/1 b/unittest/input-files/test15/1 new file mode 100644 index 00000000..d00491fd --- /dev/null +++ b/unittest/input-files/test15/1 @@ -0,0 +1 @@ +1 diff --git a/unittest/input-files/test15/2 b/unittest/input-files/test15/2 new file mode 100644 index 00000000..0cfbf088 --- /dev/null +++ b/unittest/input-files/test15/2 @@ -0,0 +1 @@ +2 diff --git a/unittest/input-files/test15/3 b/unittest/input-files/test15/3 new file mode 100644 index 00000000..00750edc --- /dev/null +++ b/unittest/input-files/test15/3 @@ -0,0 +1 @@ +3 diff --git a/unittest/input-files/test15/files b/unittest/input-files/test15/files new file mode 100644 index 00000000..1191247b --- /dev/null +++ b/unittest/input-files/test15/files @@ -0,0 +1,2 @@ +1 +2 diff --git a/unittest/tests-to-run/test17.sh b/unittest/tests-to-run/test17.sh new file mode 100644 index 00000000..fecad860 --- /dev/null +++ b/unittest/tests-to-run/test17.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +PAR=parallel + +# Test sshlogin +echo localhost >/tmp/localhost +seq 1 3 | $PAR --sshlogin 8/al -S 7/"-l eiipe fod",: --sshloginfile /tmp/localhost echo