diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2010-12-15 20:56:53 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2010-12-15 20:56:53 +0000 |
| commit | 0018bb3a6ed39ba99ffea57f5549a3fd18a1d3d7 (patch) | |
| tree | 1219b29741b5300b75dcd5b8ef207445104ccec3 /solenv | |
| parent | 1483d6f3a0373ae44350d59d42722985b5419b93 (diff) | |
add BrOffice productname_br variant and sorted substitution
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer/setupscript.pm | 2 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/windows/feature.pm | 3 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/worker.pm | 3 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/ziplist.pm | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/solenv/bin/modules/installer/setupscript.pm b/solenv/bin/modules/installer/setupscript.pm index a3bf5abf50a9..2bef69c3b537 100644 --- a/solenv/bin/modules/installer/setupscript.pm +++ b/solenv/bin/modules/installer/setupscript.pm @@ -272,7 +272,7 @@ sub replace_all_setupscriptvariables_in_script my $bigstring = ''; for my $line (@{$scriptref}) { $bigstring = $bigstring . $line; } - foreach my $key ( keys %subs ) + foreach my $key (sort { length ($b) <=> length ($a) } keys %subs) { # Attention: It must be possible to substitute "%PRODUCTNAMEn", "%PRODUCTNAME%PRODUCTVERSIONabc" my $value = $subs{$key}; diff --git a/solenv/bin/modules/installer/windows/feature.pm b/solenv/bin/modules/installer/windows/feature.pm index 39521baecdfe..7b41e4490b89 100644 --- a/solenv/bin/modules/installer/windows/feature.pm +++ b/solenv/bin/modules/installer/windows/feature.pm @@ -218,7 +218,8 @@ sub replace_variables { my ($translationfile, $variableshashref) = @_; - foreach $key (keys %{$variableshashref}) + # we want to substitute FOO_BR before FOO to avoid floating _BR suffixes + foreach $key (sort { length ($b) <=> length ($a) } keys %{$variableshashref}) { my $value = $variableshashref->{$key}; replace_one_variable($translationfile, $value, $key); diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm index 099227930af2..d5d81b357b1d 100644 --- a/solenv/bin/modules/installer/worker.pm +++ b/solenv/bin/modules/installer/worker.pm @@ -1746,7 +1746,8 @@ sub replace_variables_in_string { my $key; - foreach $key (keys %{$variableshashref}) + # we want to substitute FOO_BR before FOO to avoid floating _BR suffixes + foreach $key (sort { length ($b) <=> length ($a) } keys %{$variableshashref}) { my $value = $variableshashref->{$key}; $key = "\%" . $key; diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm index cb34331f741d..b3961841bbfe 100644 --- a/solenv/bin/modules/installer/ziplist.pm +++ b/solenv/bin/modules/installer/ziplist.pm @@ -464,7 +464,7 @@ sub replace_all_variables_in_pathes my $key; - foreach $key (keys %{$variableshashref}) + foreach $key (sort { length ($b) <=> length ($a) } keys %{$variableshashref}) { my $value = $variableshashref->{$key}; |