From 01088177aa6ac26edac63108d0972703fe6770ef Mon Sep 17 00:00:00 2001
From: Ole Tange <ole@tange.dk>
Date: Fri, 13 Jan 2017 15:47:13 +0100
Subject: [PATCH] parallel: --sqlmaster +DBURL works with different commands.

---
 src/parallel | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/parallel b/src/parallel
index 16b2714c..8a972fa9 100755
--- a/src/parallel
+++ b/src/parallel
@@ -1259,7 +1259,7 @@ sub check_invalid_option_combinations {
 
 sub init_globals {
     # Defaults:
-    $Global::version = 20170101;
+    $Global::version = 20170111;
     $Global::progname = 'parallel';
     $Global::infinity = 2**31;
     $Global::debug = 0;
@@ -9187,6 +9187,8 @@ sub replaced {
 	# $self is actually a CommandLine-object,
 	# but it looks nice to be able to say {= $job->slot() =}
 	my $job = $self;
+	$perl_expressions_as_re =
+	    join("|", map {s/^-?\d+//; "\Q$_\E"} keys %{$self->{'replacecount'}});
 	# Fish out the words that have replacement strings in them
 	for my $word (
 	    fish_out_words_containing_replacement_strings()) {
@@ -9197,13 +9199,11 @@ sub replaced {
 	    # for each arg:
 	    #   replace replacement strings with replacement in the word value
 	    #   push to replace word value
-	    $perl_expressions_as_re ||=
-		join("|", map {s/^-?\d+//; "\Q$_\E"} keys %{$self->{'replacecount'}});
 	    for my $arg (@$argref) {
 		my $val = $word;
 		# Replace {= perl expr =} with value for each arg
 		$val =~ s{\257<(-?\d+)?($perl_expressions_as_re)\257>}
-		    {
+		{
 			if($1) {
 			    # Positional replace
 			    # Find the relevant arg and replace it
@@ -9216,7 +9216,7 @@ sub replaced {
 			    $normal_replace ||= 1;
 			    ($arg ? $arg->replace($2,$quote_arg,$self) : "");
 			}
-		    }goxe;
+		    }gxe;
 		if($quote) {
 		    CORE::push(@{$replace{::shell_quote_scalar($word)}},
 			       ::shell_quote_scalar($val));