From d33a647b4bdcbf596aaad0589090dcee0fbf0297 Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Wed, 11 Mar 2015 02:50:45 +0100
Subject: [PATCH] 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: https://github.com/iojs/io.js/issues/1120
PR-URL: https://github.com/iojs/io.js/pull/1121
Reviewed-By: Rod Vagg <rod@vagg.org>
---
 .mailmap                |  9 +++++++++
 AUTHORS                 | 11 ++++++++---
 tools/update-authors.sh | 25 ++++++++++---------------
 3 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/.mailmap b/.mailmap
index 29c23fa775a2a1..9466df35810184 100644
--- a/.mailmap
+++ b/.mailmap
@@ -19,6 +19,7 @@ Brandon Benvie <brandon@bbenvie.com> <brandon@brandonbenvie.com>
 Brian White <mscdex@mscdex.net>
 Brian White <mscdex@mscdex.net> <mscdex@gmail.com>
 Chew Choon Keat <choonkeat@gmail.com>
+Colin Ihrig <cjihrig@gmail.com>
 Christopher Lenz <cmlenz@gmail.com> <chris@lamech.local>
 Daniel Berger <code+node@dpbis.net>
 Daniel Chcouri <333222@gmail.com>
@@ -76,16 +77,20 @@ Mathias Pettersson <mape@mape.me>
 Michael Bernstein <michaelrbernstein@gmail.com>
 Michael Wilber <gcr@sneakygcr.net>
 Micheil Smith <micheil@brandedcode.com> <micheil@yettobebranded.net>
+Micleusanu Nicu <micnic90@gmail.com>
 Mikael Bourges-Sevenier <mikeseven@gmail.com> <msevenier@motorola.com>
+Miroslav Bajtoš <miroslav@strongloop.com> <miro.bajtos@gmail.com>
 Mitar Milutinovic <mitar.git@tnode.com>
 Nebu Pookins<nebu@nebupookins.net>
 Nicholas Kinsey <pyrotechnick@feistystudios.com>
+Nikolai Vavilov <vvnicholas@gmail.com>
 Onne Gorter <onne@onnlucky.com>
 Paul Querna <pquerna@apache.org> <paul@querna.org>
 Ray Morgan <rmorgan@zappos.com>
 Ray Solomon <raybsolomon@gmail.com>
 Raymond Feng <enjoyjava@gmail.com> <raymond@strongloop.com>
 Rick Olson <technoweenie@gmail.com>
+Roman Reiss <me@silverwind.io>
 Ryan Dahl <ry@tinyclouds.org>
 Ryan Emery <seebees@gmail.com>
 Sam Shull <brickysam26@gmail.com> <brickysam26@samuel-shulls-computer.local>
@@ -101,6 +106,7 @@ Siddharth Mahendraker <siddharth_mahen@hotmail.com> <siddharth_mahen@me.com>
 Simon Willison <simon@simonwillison.net>
 Stanislav Opichal <opichals@gmail.com>
 Stefan Bühler <stbuehler@web.de>
+Steven R. Loomis <srl@icu-project.org>
 TJ Holowaychuk <tj@vision-media.ca>
 TJ Holowaychuk <tj@vision-media.ca> <tjholowayhuk@gmail.com>
 Tadashi SAWADA <cesare@mayverse.jp>
@@ -117,6 +123,9 @@ Trevor Burnham <trevor@databraid.com> <trevorburnham@gmail.com>
 Tyler Larson <talltyler@gmail.com>
 Vincent Voyer <v@fasterize.com>
 Willi Eggeling <email@wje-online.de>
+Yazhong Liu <yorkiefixer@gmail.com> Yazhong Liu <l900422@vip.qq.com>
+Yazhong Liu <yorkiefixer@gmail.com> Yorkie <l900422@vip.qq.com>
+Yazhong Liu <yorkiefixer@gmail.com> Yorkie <yorkiefixer@gmail.com>
 Yoshihiro KIKUCHI <yknetg@gmail.com>
 Yuichiro MASUI <masui@masuidrive.jp>
 Zachary Scott <zachary@zacharyscott.net> <zachary.s.scott@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index ab796c74058c20..4c71fad5cf31e5 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -444,7 +444,7 @@ Ryan Graham <r.m.graham@gmail.com>
 Kelly Gerber <kellygerber22@yahoo.com>
 Ryan Doenges <rhdoenges@gmail.com>
 Sean Silva <chisophugis@gmail.com>
-Miroslav Bajtoš <miro.bajtos@gmail.com>
+Miroslav Bajtoš <miroslav@strongloop.com>
 Olof Johansson <olof@ethup.se>
 Sam Roberts <vieuxtech@gmail.com>
 Kevin Locke <kevin@kevinlocke.name>
@@ -517,7 +517,6 @@ Cam Swords <cam.swords@gmail.com>
 Paul Loyd <pavelko95@gmail.com>
 Benjamin Waters <benjamin.waters@outlook.com>
 Lev Gimelfarb <lev.gimelfarb@gmail.com>
-Yorkie <l900422@vip.qq.com>
 pflannery <pflannery@users.noreply.github.com>
 Tuğrul Topuz <tugrultopuz@gmail.com>
 Lorenz Leutgeb <lorenz.leutgeb@gmail.com>
@@ -655,7 +654,7 @@ Evan Torrie <evan.torrie@yahoo.com>
 Juanjo <juanjo@bitrock.com>
 brian m. carlson <sandals@crustytoothpaste.net>
 Kevin O'Hara <kevinohara80@gmail.com>
-micnic <micnic90@gmail.com>
+Micleusanu Nicu <micnic90@gmail.com>
 Alejandro Oviedo <alejandro.oviedo.g@gmail.com>
 Ben Burns <benjamin.c.burns@gmail.com>
 Julian Duque <julianduquej@gmail.com>
@@ -723,5 +722,11 @@ Ryan Scheel <Ryan.havvy@gmail.com>
 Benjamin Gruenbaum <inglor@gmail.com>
 Pavel Medvedev <pmedvedev@gmail.com>
 Russell Dempsey <sgtpooki@gmail.com>
+&! (bitandbang) <tieliaco@gmail.com>
+h7lin <i@h7lin.com>
+Michael Dawson <michael_dawson@ca.ibm.com>
+Ruben Verborgh <ruben@verborgh.org>
+Ken Perkins <ken.perkins@rackspace.com>
+Malte-Thorben Bruns <skenqbx@gmail.com>
 
 # Generated by tools/update-authors.sh
diff --git a/tools/update-authors.sh b/tools/update-authors.sh
index f0944889b2cb4f..d07d9c9ff73c43 100755
--- a/tools/update-authors.sh
+++ b/tools/update-authors.sh
@@ -1,27 +1,22 @@
 #!/bin/sh
 
-git log --reverse --format='%aN <%aE>' | awk '
+git log --reverse --format='%aN <%aE>' | perl -we '
 
 BEGIN {
-  print "# Authors ordered by first contribution.\n";
-
-  # explicit excludes
-  excludes["<erik.corry@gmail.com>"] = 1 # chromium team
+  %seen = (), @authors = ();
 }
 
-{
-  if ($NF !~ /@chromium.org/ && all[$NF] != 1 && excludes[$NF] != 1) {
-    all[$NF] = 1;
-    ordered[length(all)] = $0;
-  }
+while (<>) {
+  next if $seen{$_};
+  next if /\@chromium.org/;
+  next if /<erik.corry\@gmail.com>/;
+  $seen{$_} = push @authors, $_;
 }
 
 END {
-  for (i in ordered) {
-    print ordered[i];
-  }
-
-  print "\n# Generated by tools/update-authors.sh";
+  print "# Authors ordered by first contribution.\n";
+  print "\n", @authors, "\n";
+  print "# Generated by tools/update-authors.sh\n";
 }
 
 ' > AUTHORS