From fc09aad8fcb2563c9cdddc86d06282fdef3c3bed Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Sat, 14 May 2016 00:51:39 +0200 Subject: reproducible notes.git committer count: remove clever pipe (which didnt work) and use the same grep command twice --- bin/reproducible_html_dashboard.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'bin/reproducible_html_dashboard.sh') diff --git a/bin/reproducible_html_dashboard.sh b/bin/reproducible_html_dashboard.sh index 0e03d364..6a7b01e8 100755 --- a/bin/reproducible_html_dashboard.sh +++ b/bin/reproducible_html_dashboard.sh @@ -501,12 +501,16 @@ create_dashboard_page() { write_page "$TD_PKG_SID" write_page "$TD_PKG_TESTING" - # this IGNOREPIPE needs to be manually maintained indeed… - # for the last 3 months we live with errors… - IGNOREPIPE="grep -v alexis@passoire.fr | grep -v christoph.berg@credativ.de | grep -v d.s@daniel.shahaf.name | grep -v dhole@openmailbox.com | grep -v jelmer@jelmer.uk | grep -v mattia@mapreri.org | grep -v micha@lenk.info | grep -v mail@sandroknauss.de | grep -v sanvila@unex.es" + # in the following two write_page() calls we use the same + # insane grep to filter people who committed with several + # usernames… if [ -f ${NOTES_GIT_PATH}/packages.yml ] && [ -f ${NOTES_GIT_PATH}/issues.yml ] ; then - write_page "committers to notes.git (in the last three months)$(cd ${NOTES_GIT_PATH} ; git log --since="3 months ago"|grep Author|sort -u |wc -l)" - write_page "committers to notes.git (in total)$(cd ${NOTES_GIT_PATH} ; git log |grep Author|sort -u |$IGNOREPIPE|wc -l)" + write_page "committers to notes.git (in the last three months)$(cd ${NOTES_GIT_PATH} ; git log --since="3 months ago"|grep Author|sort -u | \ + grep -v alexis@passoire.fr | grep -v christoph.berg@credativ.de | grep -v d.s@daniel.shahaf.name | grep -v dhole@openmailbox.com | grep -v jelmer@jelmer.uk | grep -v mattia@mapreri.org | grep -v micha@lenk.info | grep -v mail@sandroknauss.de | grep -v sanvila@unex.es | \ + wc -l)" + write_page "committers to notes.git (in total)$(cd ${NOTES_GIT_PATH} ; git log |grep Author|sort -u | \ + grep -v alexis@passoire.fr | grep -v christoph.berg@credativ.de | grep -v d.s@daniel.shahaf.name | grep -v dhole@openmailbox.com | grep -v jelmer@jelmer.uk | grep -v mattia@mapreri.org | grep -v micha@lenk.info | grep -v mail@sandroknauss.de | grep -v sanvila@unex.es | \ + wc -l)" fi RESULT=$(cat /srv/reproducible-results/modified_in_sid.txt || echo "unknown") # written by reproducible_html_repository_comparison.sh write_page "packages modified in our toolchain (in unstable)$(echo $RESULT)" -- cgit v1.2.3-70-g09d2