diff options
| -rwxr-xr-x | bin/reproducible_stats.sh | 3 | ||||
| -rwxr-xr-x | update_jdn.sh | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/bin/reproducible_stats.sh b/bin/reproducible_stats.sh index f84b3055..0d060c79 100755 --- a/bin/reproducible_stats.sh +++ b/bin/reproducible_stats.sh @@ -37,7 +37,7 @@ rm index.html htmlecho "<html><body>" > index.html htmlecho "<h2>Statistics for reproducible builds</h2>" htmlecho "<p>Results were obtaining by <a href=\"$JENKINS_URL/view/reproducible\">several jobs running on jenkins.debian.net</a>. This page is updated after each job run.</p>" -htmlecho "<p>$COUNT_TOTAL packages attempted to build so far, that's $PERCENT_TOTAL% of $AMOUNT in Debian $SUITE currently.</p>" +htmlecho "<p>$COUNT_TOTAL packages attempted to build so far, that's $PERCENT_TOTAL% of $AMOUNT in Debian $SUITE currently. Out of these, $PERCENT_GOOD% were successful, so quite wildly guessing this roughy means about $GUESS_GOOD packages should be build reproducibly! Yay! :-)</p>" htmlecho "<p>$COUNT_BAD packages ($PERCENT_BAD% of $COUNT_TOTAL) failed to built reproducibly: <code>" for PKG in $BAD ; do VERSION=$(sqlite3 $PACKAGES_DB "SELECT version FROM source_packages WHERE name = \"$PKG\"") @@ -52,7 +52,6 @@ if [ $COUNT_SOURCELESS -gt 0 ] ; then htmlecho "<p>$COUNT_SOURCELESS packages which don't exist in sid and need investigation: <code>$SOURCELESS</code></p>" fi htmlecho "<p>$COUNT_GOOD packages ($PERCENT_GOOD% of $COUNT_TOTAL) successfully built reproducibly: <code>${GOOD}</code></p>" -htmlecho "<p>\"$PERCENT_GOOD% of $AMOUNT\" and \"$PERCENT_TOTAL% of $AMOUNT\" means roughly+wildly guessed $GUESS_GOOD packages that can be build reproducibly! Yay! :-)" htmlecho "<hr><p>Packages which failed to build reproducibly, sorted by Maintainers: and Uploaders: fields." htmlecho "<pre>$(echo $BAD | dd-list -i) </pre></p>" htmlecho "<hr><p><font size='-1'><a href=\"$JENKINS_URL/userContent/diffp.html\">Static URL for this page.</a> Last modified: $(date)</font>" diff --git a/update_jdn.sh b/update_jdn.sh index ef38198b..d6f77e15 100755 --- a/update_jdn.sh +++ b/update_jdn.sh @@ -59,7 +59,7 @@ fi # sudo apt-get install vim screen less etckeeper moreutils curl mtr-tiny dstat devscripts bash-completion shorewall shorewall6 cron-apt apt-listchanges munin munin-plugins-extra calamaris visitors procmail libjson-rpc-perl libfile-touch-perl zutils ip2host \ build-essential python-setuptools \ - debootstrap sudo figlet graphviz apache2 python-yaml python-pip mr subversion subversion-tools vnstat webcheck poxml vncsnapshot imagemagick ffmpeg2theora python-twisted python-imaging gocr guestmount schroot sqlite3\ + debootstrap sudo figlet -f banner graphviz apache2 python-yaml python-pip mr subversion subversion-tools vnstat webcheck poxml vncsnapshot imagemagick ffmpeg2theora python-twisted python-imaging gocr guestmount schroot sqlite3\ unzip python-hachoir-metadata ghc sudo apt-get install -t wheezy-backports qemu explain "Packages installed." @@ -132,7 +132,7 @@ DEFINED_DI_TRIGGERS=$(grep "defaults: d-i-manual-html" d-i.yaml|wc -l) let DEFINED_TRIGGERS=DEFINED_MY_TRIGGERS+DEFINED_DI_TRIGGERS let CONFIGURED_TRIGGERS=$(grep \<childProjects /var/lib/jenkins/jobs/*/config.xml|wc -l)+$(grep \<childProjects /var/lib/jenkins/jobs/*/config.xml |grep , |xargs -r echo | sed 's/[^,]//g'| wc -m)-1 if [ "$DEFINED_TRIGGERS" != "$CONFIGURED_TRIGGERS" ] ; then - figlet Warning + figlet -f banner Warning explain "Number of defined triggers ($DEFINED_TRIGGERS) differs from currently configured triggers ($CONFIGURED_TRIGGERS), please investigate." fi @@ -163,7 +163,7 @@ rgrep FIXME $BASEDIR/* | grep -v "rgrep FIXME" | grep -v echo # creating LVM volume group for jobs # if [ "$PVNAME" = "" ]; then - figlet Error + figlet -f banner Error explain "Set \$PVNAME to physical volume pathname." exit 1 else |