Skip to content

Commit d33a647

Browse files
committed
doc: make tools/update-authors.sh cross-platform
And by cross-platform I mean Linux and OS X. The awk script is not compatible with BSD awk, that's why this commit changes it to perl. Update the .mailmap to remove some duplicates and regenerate the AUTHORS file. Fixes: #1120 PR-URL: #1121 Reviewed-By: Rod Vagg <rod@vagg.org>
1 parent 8453fbc commit d33a647

File tree

3 files changed

+27
-18
lines changed

3 files changed

+27
-18
lines changed

.mailmap

+9
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ Brandon Benvie <brandon@bbenvie.com> <brandon@brandonbenvie.com>
1919
Brian White <mscdex@mscdex.net>
2020
Brian White <mscdex@mscdex.net> <mscdex@gmail.com>
2121
Chew Choon Keat <choonkeat@gmail.com>
22+
Colin Ihrig <cjihrig@gmail.com>
2223
Christopher Lenz <cmlenz@gmail.com> <chris@lamech.local>
2324
Daniel Berger <code+node@dpbis.net>
2425
Daniel Chcouri <333222@gmail.com>
@@ -76,16 +77,20 @@ Mathias Pettersson <mape@mape.me>
7677
Michael Bernstein <michaelrbernstein@gmail.com>
7778
Michael Wilber <gcr@sneakygcr.net>
7879
Micheil Smith <micheil@brandedcode.com> <micheil@yettobebranded.net>
80+
Micleusanu Nicu <micnic90@gmail.com>
7981
Mikael Bourges-Sevenier <mikeseven@gmail.com> <msevenier@motorola.com>
82+
Miroslav Bajtoš <miroslav@strongloop.com> <miro.bajtos@gmail.com>
8083
Mitar Milutinovic <mitar.git@tnode.com>
8184
Nebu Pookins<nebu@nebupookins.net>
8285
Nicholas Kinsey <pyrotechnick@feistystudios.com>
86+
Nikolai Vavilov <vvnicholas@gmail.com>
8387
Onne Gorter <onne@onnlucky.com>
8488
Paul Querna <pquerna@apache.org> <paul@querna.org>
8589
Ray Morgan <rmorgan@zappos.com>
8690
Ray Solomon <raybsolomon@gmail.com>
8791
Raymond Feng <enjoyjava@gmail.com> <raymond@strongloop.com>
8892
Rick Olson <technoweenie@gmail.com>
93+
Roman Reiss <me@silverwind.io>
8994
Ryan Dahl <ry@tinyclouds.org>
9095
Ryan Emery <seebees@gmail.com>
9196
Sam Shull <brickysam26@gmail.com> <brickysam26@samuel-shulls-computer.local>
@@ -101,6 +106,7 @@ Siddharth Mahendraker <siddharth_mahen@hotmail.com> <siddharth_mahen@me.com>
101106
Simon Willison <simon@simonwillison.net>
102107
Stanislav Opichal <opichals@gmail.com>
103108
Stefan Bühler <stbuehler@web.de>
109+
Steven R. Loomis <srl@icu-project.org>
104110
TJ Holowaychuk <tj@vision-media.ca>
105111
TJ Holowaychuk <tj@vision-media.ca> <tjholowayhuk@gmail.com>
106112
Tadashi SAWADA <cesare@mayverse.jp>
@@ -117,6 +123,9 @@ Trevor Burnham <trevor@databraid.com> <trevorburnham@gmail.com>
117123
Tyler Larson <talltyler@gmail.com>
118124
Vincent Voyer <v@fasterize.com>
119125
Willi Eggeling <email@wje-online.de>
126+
Yazhong Liu <yorkiefixer@gmail.com> Yazhong Liu <l900422@vip.qq.com>
127+
Yazhong Liu <yorkiefixer@gmail.com> Yorkie <l900422@vip.qq.com>
128+
Yazhong Liu <yorkiefixer@gmail.com> Yorkie <yorkiefixer@gmail.com>
120129
Yoshihiro KIKUCHI <yknetg@gmail.com>
121130
Yuichiro MASUI <masui@masuidrive.jp>
122131
Zachary Scott <zachary@zacharyscott.net> <zachary.s.scott@gmail.com>

AUTHORS

+8-3
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ Ryan Graham <r.m.graham@gmail.com>
444444
Kelly Gerber <kellygerber22@yahoo.com>
445445
Ryan Doenges <rhdoenges@gmail.com>
446446
Sean Silva <chisophugis@gmail.com>
447-
Miroslav Bajtoš <miro.bajtos@gmail.com>
447+
Miroslav Bajtoš <miroslav@strongloop.com>
448448
Olof Johansson <olof@ethup.se>
449449
Sam Roberts <vieuxtech@gmail.com>
450450
Kevin Locke <kevin@kevinlocke.name>
@@ -517,7 +517,6 @@ Cam Swords <cam.swords@gmail.com>
517517
Paul Loyd <pavelko95@gmail.com>
518518
Benjamin Waters <benjamin.waters@outlook.com>
519519
Lev Gimelfarb <lev.gimelfarb@gmail.com>
520-
Yorkie <l900422@vip.qq.com>
521520
pflannery <pflannery@users.noreply.github.com>
522521
Tuğrul Topuz <tugrultopuz@gmail.com>
523522
Lorenz Leutgeb <lorenz.leutgeb@gmail.com>
@@ -655,7 +654,7 @@ Evan Torrie <evan.torrie@yahoo.com>
655654
Juanjo <juanjo@bitrock.com>
656655
brian m. carlson <sandals@crustytoothpaste.net>
657656
Kevin O'Hara <kevinohara80@gmail.com>
658-
micnic <micnic90@gmail.com>
657+
Micleusanu Nicu <micnic90@gmail.com>
659658
Alejandro Oviedo <alejandro.oviedo.g@gmail.com>
660659
Ben Burns <benjamin.c.burns@gmail.com>
661660
Julian Duque <julianduquej@gmail.com>
@@ -723,5 +722,11 @@ Ryan Scheel <Ryan.havvy@gmail.com>
723722
Benjamin Gruenbaum <inglor@gmail.com>
724723
Pavel Medvedev <pmedvedev@gmail.com>
725724
Russell Dempsey <sgtpooki@gmail.com>
725+
&! (bitandbang) <tieliaco@gmail.com>
726+
h7lin <i@h7lin.com>
727+
Michael Dawson <michael_dawson@ca.ibm.com>
728+
Ruben Verborgh <ruben@verborgh.org>
729+
Ken Perkins <ken.perkins@rackspace.com>
730+
Malte-Thorben Bruns <skenqbx@gmail.com>
726731

727732
# Generated by tools/update-authors.sh

tools/update-authors.sh

+10-15
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,22 @@
11
#!/bin/sh
22

3-
git log --reverse --format='%aN <%aE>' | awk '
3+
git log --reverse --format='%aN <%aE>' | perl -we '
44
55
BEGIN {
6-
print "# Authors ordered by first contribution.\n";
7-
8-
# explicit excludes
9-
excludes["<erik.corry@gmail.com>"] = 1 # chromium team
6+
%seen = (), @authors = ();
107
}
118
12-
{
13-
if ($NF !~ /@chromium.org/ && all[$NF] != 1 && excludes[$NF] != 1) {
14-
all[$NF] = 1;
15-
ordered[length(all)] = $0;
16-
}
9+
while (<>) {
10+
next if $seen{$_};
11+
next if /\@chromium.org/;
12+
next if /<erik.corry\@gmail.com>/;
13+
$seen{$_} = push @authors, $_;
1714
}
1815
1916
END {
20-
for (i in ordered) {
21-
print ordered[i];
22-
}
23-
24-
print "\n# Generated by tools/update-authors.sh";
17+
print "# Authors ordered by first contribution.\n";
18+
print "\n", @authors, "\n";
19+
print "# Generated by tools/update-authors.sh\n";
2520
}
2621
2722
' > AUTHORS

0 commit comments

Comments
 (0)