Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@couchdb.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: jan@apache.org
To: commits@couchdb.apache.org
Subject: git commit: A portable way to populate THANKS.
Message-Id: <20130104162847.7532A8227DB@tyr.zones.apache.org>
Date: Fri,  4 Jan 2013 16:28:47 +0000 (UTC)

Updated Branches:
  refs/heads/master 0d6fba2e6 -> 4b2041839


A portable way to populate THANKS.

In particular:
 - BSD sed and GNU sed dosagree on commandline options.
 - echo "\n" >> FILE or "\r\n" for that matter, does not create a
   newline in FILE on Windows.

Original patch by Christopher Bonhage, applied with slight modification.

Closes COUCHDB-1628.


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/4b204183
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/4b204183
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/4b204183

Branch: refs/heads/master
Commit: 4b20418391a9a77012ff74c8064f3da910c310fb
Parents: 0d6fba2
Author: Jan Lehnardt <jan@apache.org>
Authored: Fri Jan 4 16:54:10 2013 +0100
Committer: Jan Lehnardt <jan@apache.org>
Committed: Fri Jan 4 17:28:42 2013 +0100

----------------------------------------------------------------------
 bootstrap |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/4b204183/bootstrap
----------------------------------------------------------------------
diff --git a/bootstrap b/bootstrap
index b7c949a..1e5bdf1 100755
--- a/bootstrap
+++ b/bootstrap
@@ -44,11 +44,23 @@ else
 fi
 
 if test -d .git; then
+    OS=`uname -s`
+    case "$OS" in
+    Linux|CYGWIN*) # GNU sed
+        SED_ERE_FLAG=-r
+    ;;
+    *) # BSD sed
+        SED_ERE_FLAG=-E
+    ;;
+    esac
+
     sed -e "/^#.*/d" THANKS.in > THANKS
+    CONTRIB_EMAIL_SED_COMMAND="s/^[[:blank:]]{5}[[:digit:]]+[[:blank:]]/ * /"
     git shortlog -se 6c976bd..HEAD \
         | grep -v @apache.org \
-        | sed -E "s/^[[:blank:]]{5}[[:digit:]]+[[:blank:]]/ * /" >> THANKS
-    echo "\nFor a list of authors see the \`AUTHORS\` file." >> THANKS
+        | sed $SED_ERE_FLAG -e "$CONTRIB_EMAIL_SED_COMMAND" >> THANKS
+    echo "" >> THANKS # simplest portable newline
+    echo "For a list of authors see the \`AUTHORS\` file." >> THANKS
 fi
 
 find_program() {