From a315bd26e610f087f677e876312261dcc65deeca Mon Sep 17 00:00:00 2001 From: Ole Tange Date: Sat, 22 Oct 2016 13:31:11 +0200 Subject: [PATCH] parallel: shellwords is defined in newer versions of Perl causing redefine error. --- src/parallel | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/parallel b/src/parallel index fd79a7e4..0a672081 100755 --- a/src/parallel +++ b/src/parallel @@ -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: