tange/parallel
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/parallel.git synced 2024-11-22 14:07:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

parallel: shellwords is defined in newer versions of Perl causing

Browse source 
redefine error.
This commit is contained in:
Ole Tange 2016-10-22 13:31:11 +02:00
parent 67da57ccc7
commit a315bd26e6
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/parallel
View file

@ -1671,7 +1671,7 @@ sub read_options {
while(<$in_fh>) { while(<$in_fh>) {
/^\s*\#/ and next; /^\s*\#/ and next;
chomp; chomp;
push @ARGV_profile, shellwords($_); push @ARGV_profile, shell_words($_);
} }
close $in_fh; close $in_fh;
} else { } else {
@ -1685,7 +1685,7 @@ sub read_options {
} }
# Add options from shell variable $PARALLEL # Add options from shell variable $PARALLEL
if($ENV{'PARALLEL'}) { if($ENV{'PARALLEL'}) {
@ARGV_env = shellwords($ENV{'PARALLEL'}); @ARGV_env = shell_words($ENV{'PARALLEL'});
} }
} }
Getopt::Long::Configure("bundling","require_order"); Getopt::Long::Configure("bundling","require_order");
@ -1930,7 +1930,7 @@ sub shell_quote_file {
return $a; return $a;
} }
sub shellwords { sub shell_words {
# Input: # Input:
# $string = shell line # $string = shell line
# Returns: # Returns: