browser: merge deprecated agents on newer target

[sheet.git] / tools / mkcaniuse

diff --git a/tools/mkcaniuse b/tools/mkcaniuse
index adb437c91a7fd6c3791406a9f15b54545d7e7d67..8378d2ff4c63366fc1397fb1ac08d3ec2c01017f 100755 (executable)
--- a/tools/mkcaniuse
+++ b/tools/mkcaniuse
@@ -29,16 +29,19 @@ delete $data->{eras};
 for (values %{ $data->{data} }) {
        delete @{$_}{qw[ usage_perc_a usage_perc_y ]};
 }
-while (my ($browser, $target) = each %BROWSERJOIN) {
-       my $agent1 = delete $data->{agents}->{$browser} or next;
-       my $agent2 =        $data->{agents}->{$target}  or next;
-       push @{ $agent2->{version_list} }, @{ $agent1->{version_list} };
-       $agent2->{browser} = sprintf '%s (former %s)',
-               $agent1->{browser}, $agent2->{browser};
+while (my ($browser, $alias) = each %BROWSERJOIN) {
+       my $agent =        $data->{agents}->{$browser} or next;
+       my $amend = delete $data->{agents}->{$alias}   or next;
+       unshift @{ $agent->{version_list} }, @{ $amend->{version_list} };
+       $agent->{browser} = sprintf '%s (former %s)',
+               $agent->{browser}, $amend->{browser};
+
+       # prefer deprecated name if newer is convoluted (Chr/And.)
+       $agent->{abbr} = $amend->{abbr} if $agent->{abbr} =~ m{/};
 
        for (values %{ $data->{data} }) {
-               my $stats = delete $_->{stats}->{$browser} or next;
-               $_ = { %{$_}, %{$stats} } for $_->{stats}->{$target};
+               my $stats = delete $_->{stats}->{$alias} or next;
+               $_ = { %{$_}, %{$stats} } for $_->{stats}->{$browser};
        }
 }