contributors: Also include people who contributed to curl-www

Closes #4884

diff --git a/scripts/contributors.sh b/scripts/contributors.sh
index 0bb16ec004182acd05d06300ad7b9c0e580fa627..6a6d344841588f53da320b762a87746afc0c2e66 100755 (executable)
--- a/scripts/contributors.sh
+++ b/scripts/contributors.sh
@@ -38,6 +38,11 @@ if test -z "$start"; then
     echo "Since $start:"
 fi
 
+# We also include curl-www if possible. Override by setting CURLWWW
+if [ -z "$CURLWWW" ] ; then
+    CURLWWW=../curl-www
+fi
+
 # filter out Author:, Commit: and *by: lines
 # cut off the email parts
 # split list of names at comma
@@ -47,8 +52,15 @@ fi
 # only count names with a space (ie more than one word)
 # sort all unique names
 # awk them into RELEASE-NOTES format
+
 (
-git log --pretty=full --use-mailmap $start..HEAD | \
+ (
+  git log --pretty=full --use-mailmap $start..HEAD
+  if [ -d "$CURLWWW" ]
+  then
+   git -C ../curl-www log --pretty=full --use-mailmap $start..HEAD
+  fi
+ ) | \
 egrep -ai '(^Author|^Commit|by):' | \
 cut -d: -f2- | \
 cut '-d(' -f1 | \

diff --git a/scripts/contrithanks.sh b/scripts/contrithanks.sh
index da395aebf05971445987ed858268726fdb76fd86..44e461455aa16762a0343e9087698740fb91dfa6 100755 (executable)
--- a/scripts/contrithanks.sh
+++ b/scripts/contrithanks.sh
@@ -36,10 +36,23 @@ if test -z "$start"; then
   start=`git tag --sort=taggerdate | tail -1`;
 fi
 
+
+# We also include curl-www if possible. Override by setting CURLWWW
+if [ -z "$CURLWWW" ] ; then
+    CURLWWW=../curl-www
+fi
+
 cat ./docs/THANKS
 
 (
-git log --use-mailmap $start..HEAD | \
+ (
+  git log --use-mailmap $start..HEAD
+  if [ -d "$CURLWWW" ]
+  then
+   git -C ../curl-www log --use-mailmap $start..HEAD
+  fi
+ ) | \
+
 egrep -ai '(^Author|^Commit|by):' | \
 cut -d: -f2- | \
 cut '-d(' -f1 | \