From bbedf716c1991f90ec77bf41c391a23cf7e56d1a Mon Sep 17 00:00:00 2001 From: Ole Tange Date: Wed, 22 Apr 2015 18:26:41 +0200 Subject: [PATCH] parallel: Give multiple --sshlogin by separating them with \n. --- src/parallel | 2 +- src/parallel.pod | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/parallel b/src/parallel index 959ef13b..df0b1253 100755 --- a/src/parallel +++ b/src/parallel @@ -2472,7 +2472,7 @@ sub parse_sshlogin { if(not @Global::sshlogin) { @Global::sshlogin = (":"); } for my $sshlogin (@Global::sshlogin) { # Split up -S sshlogin,sshlogin - for my $s (split /,/, $sshlogin) { + for my $s (split /,|\n/, $sshlogin) { if ($s eq ".." or $s eq "-") { # This may add to @Global::sshlogin - possibly bug read_sshloginfile(expand_slf_shorthand($s)); diff --git a/src/parallel.pod b/src/parallel.pod index 66fb4cc0..43802e1c 100644 --- a/src/parallel.pod +++ b/src/parallel.pod @@ -1674,8 +1674,8 @@ The sshlogin '..' is special, it read sshlogins from ~/.parallel/sshloginfile The sshlogin '-' is special, too, it read sshlogins from stdin (standard input). -To specify more sshlogins separate the sshlogins by comma or repeat -the options multiple times. +To specify more sshlogins separate the sshlogins by comma, newline (in +the same string), or repeat the options multiple times. For examples: see B<--sshloginfile>.