mirror of
https://git.savannah.gnu.org/git/parallel.git
synced 2024-11-22 14:07:55 +00:00
parallel: shellwords is defined in newer versions of Perl causing
redefine error.
This commit is contained in:
parent
67da57ccc7
commit
a315bd26e6
|
@ -1671,7 +1671,7 @@ sub read_options {
|
|||
while(<$in_fh>) {
|
||||
/^\s*\#/ and next;
|
||||
chomp;
|
||||
push @ARGV_profile, shellwords($_);
|
||||
push @ARGV_profile, shell_words($_);
|
||||
}
|
||||
close $in_fh;
|
||||
} else {
|
||||
|
@ -1685,7 +1685,7 @@ sub read_options {
|
|||
}
|
||||
# Add options from shell variable $PARALLEL
|
||||
if($ENV{'PARALLEL'}) {
|
||||
@ARGV_env = shellwords($ENV{'PARALLEL'});
|
||||
@ARGV_env = shell_words($ENV{'PARALLEL'});
|
||||
}
|
||||
}
|
||||
Getopt::Long::Configure("bundling","require_order");
|
||||
|
@ -1930,7 +1930,7 @@ sub shell_quote_file {
|
|||
return $a;
|
||||
}
|
||||
|
||||
sub shellwords {
|
||||
sub shell_words {
|
||||
# Input:
|
||||
# $string = shell line
|
||||
# Returns:
|
||||
|
|
Loading…
Reference in a new issue