From d37105b45619b11175a680830363c51e1b0541a5 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Thu, 5 Mar 2015 14:42:00 +0100 Subject: reproducible: several small tweaks to page headers --- bin/reproducible_common.sh | 11 +++++------ bin/reproducible_html_graphs.sh | 3 +++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh index 583c934f..5e9a9b71 100755 --- a/bin/reproducible_common.sh +++ b/bin/reproducible_common.sh @@ -91,7 +91,7 @@ init_html() { SPOKENTARGET["suite_stats"]="$SUITE stats" SPOKENTARGET["repo_stats"]="repositories overview" SPOKENTARGET["stats"]="reproducible stats" - # query some data we need everywhere + # FIXME: this can probably all go into html_graph.sh now...: query some data we need everywhere AMOUNT=$(sqlite3 -init $INIT $PACKAGES_DB "SELECT count(*) FROM sources WHERE suite=\"${SUITE}\"") COUNT_TOTAL=$(sqlite3 -init $INIT $PACKAGES_DB "SELECT COUNT(*) FROM results AS r JOIN sources AS s ON r.package_id=s.id WHERE s.suite=\"${SUITE}\"") COUNT_GOOD=$(sqlite3 -init $INIT $PACKAGES_DB "SELECT COUNT(*) FROM results AS r JOIN sources AS s ON r.package_id=s.id WHERE s.suite=\"${SUITE}\" AND r.status=\"reproducible\"") @@ -140,12 +140,11 @@ write_page_header() { write_page "" write_page "$2" write_page "

$2

" - if [ "$1" = "$MAINVIEW" ] || [ "$1" = "suite_stats" ] ; then - write_page "

These pages contain results obtained from several jobs running on jenkins.debian.net. Thanks to Profitbricks for donating the virtual machine this is running on!

" + if [ "$1" = "$MAINVIEW" ] ; then + write_page "

These pages are showing the prospects of reproducible builds of Debian packages. The results shown were obtained from several jobs running on jenkins.debian.net. Thanks to Profitbricks for donating the virtual machine this is running on!

" fi - if [ "${1:0:3}" = "all" ] || [ "$1" = "dd-list" ] || [ "$1" = "stats" ] || [ "$1" = "suite_stats" ] ; then - write_page "

$COUNT_TOTAL packages have been attempted to be build so far, that's $PERCENT_TOTAL% of $AMOUNT source packages in Debian $SUITE currently. Out of these, $COUNT_GOOD packages ($PERCENT_GOOD%) could be built reproducible!" - write_page " Join #debian-reproducible on OFTC to get support for making sure your packages build reproducibly too!" + if [ "$1" = "dd-list" ] || [ "$1" = "stats" ] ; then + write_page " Join #debian-reproducible on OFTC or send us an email to get support for making sure your packages build reproducibly too!" write_page "

" fi write_page "