From b0756c284f849dba96255832955a48ba670fce2b Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Tue, 7 Oct 2014 20:46:48 +0200 Subject: reproducible: improve output and grammar --- bin/reproducible_stats.sh | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/bin/reproducible_stats.sh b/bin/reproducible_stats.sh index c0047566..ce25953d 100755 --- a/bin/reproducible_stats.sh +++ b/bin/reproducible_stats.sh @@ -158,12 +158,12 @@ write_summary_header() { write_summary "" write_summary "" write_summary "" - write_summary "

Statistics for reproducible builds

" + write_summary "

$2

" if [ "$1" = "$MAINVIEW" ] ; then - write_summary "

This page is updated every three hours. Results are obtained from several build jobs running on jenkins.debian.net. Thanks to Profitbricks for donating the virtual machine it's running on!

" + write_summary "

These pages are updated every three hours. Results are obtained from several build jobs running on jenkins.debian.net. Thanks to Profitbricks for donating the virtual machine it's running on!

" write_summary "

$COUNT_TOTAL packages attempted to build so far, that's $PERCENT_TOTAL% of $AMOUNT source packages in Debian $SUITE currently. Out of these, $PERCENT_GOOD% were successful, so quite wildly guessing this roughy means about $GUESS_GOOD packages should be reproducibly buildable! Join #debian-reproducible on OFTC to get support for making sure your packages build reproducibly too!

" fi - write_summary "

Other views for the build results:

    " + write_summary "

      Other views for the build results:" for TARGET in $ALLVIEWS dd-list; do if [ "$TARGET" = "$1" ] ; then continue @@ -194,29 +194,29 @@ EXTRA_STAR=false process_packages ${UGLY["all"]} ${GOOD["all"]} MAINVIEW="last_24h" -ALLVIEWS="all last_24h last_48h" +ALLVIEWS="last_24h last_48h all" for VIEW in $ALLVIEWS ; do SUMMARY=index_${VIEW}.html echo "Starting to write $SUMMARY page." - write_summary_header $VIEW - write_summary "

      $COUNT_BAD packages ($PERCENT_BAD% of $COUNT_TOTAL) failed to built reproducibly: " + write_summary_header $VIEW "Statistics for reproducible builds of ${SPOKENTARGET[$VIEW]}" + write_summary "

      $COUNT_BAD packages ($PERCENT_BAD% of $COUNT_TOTAL) failed to built reproducibly in total, from ${SPOKENTARGET[$VIEW]} these were: " link_packages ${BAD[$VIEW]} write_summary "

      " write_summary "

      A β sign after a package name indicates that no .buildinfo file was generated.

      " write_summary - write_summary "

      $COUNT_UGLY packages ($PERCENT_UGLY%) failed to build from source: " + write_summary "

      $COUNT_UGLY packages ($PERCENT_UGLY%) failed to build from source in total, from ${SPOKENTARGET[$VIEW]} these were: " link_packages ${UGLY[$VIEW]} write_summary "

      " if [ $COUNT_SOURCELESS -gt 0 ] ; then - write_summary "

      $COUNT_SOURCELESS ($PERCENT_SOURCELESS%) packages where the source could not be downloaded. ${SOURCELESS[$VIEW]}

      " + write_summary "

      For $COUNT_SOURCELESS ($PERCENT_SOURCELESS%) packages in total sources could not be downloaded, from ${SPOKENTARGET[$VIEW]} these were: ${SOURCELESS[$VIEW]}

      " fi if [ $COUNT_NOTFORUS -gt 0 ] ; then - write_summary "

      $COUNT_NOTFORUS ($PERCENT_NOTFORUS%) packages which are neither Architecture: 'any' nor 'all' nor 'amd64' nor 'linux-amd64': ${NOTFORUS[$VIEW]}

      " + write_summary "

      In total there were $COUNT_NOTFORUS ($PERCENT_NOTFORUS%) packages which are neither Architecture: 'any' nor 'all' nor 'amd64' nor 'linux-amd64', from ${SPOKENTARGET[$VIEW]} these were: ${NOTFORUS[$VIEW]}

      " fi - if [ $COUNT_BLACKLISTED -gt 0 ] ; then + if [ "$VIEW" = "all" ] && [ $COUNT_BLACKLISTED -gt 0 ] ; then write_summary "

      $COUNT_BLACKLISTED packages are blacklisted and will never be tested here: $BLACKLISTED

      " fi - write_summary "

      $COUNT_GOOD packages ($PERCENT_GOOD%) successfully built reproducibly: " + write_summary "

      $COUNT_GOOD packages ($PERCENT_GOOD%) successfully built reproducibly, from ${SPOKENTARGET[$VIEW]} these were: " link_packages ${GOOD[$VIEW]} write_summary "

      " write_summary_footer @@ -226,8 +226,7 @@ done VIEW=dd-list SUMMARY=index_${VIEW}.html echo "Starting to write $SUMMARY page." -write_summary_header $VIEW -write_summary "

      Packages which failed to build reproducibly, sorted by Maintainers: and Uploaders: fields

      " +write_summary_header $VIEW "Statistics for reproducible builds of ${SPOKENTARGET[$VIEW]}" write_summary "

      $(echo ${BAD["all"]} | dd-list -i)

      " write_summary_footer publish_summary -- cgit v1.2.3-70-g09d2