From 96fd9fcd09a28782ccd4b6ec3733b3a9a3b5dcbb Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Tue, 21 Nov 2017 20:30:12 +0000 Subject: reproducible Arch Linux: fix filepath and improve HTML Signed-off-by: Holger Levsen --- bin/reproducible_build_archlinux_pkg.sh | 3 ++- bin/reproducible_html_archlinux.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/reproducible_build_archlinux_pkg.sh b/bin/reproducible_build_archlinux_pkg.sh index 5a35c757..89ca4e98 100755 --- a/bin/reproducible_build_archlinux_pkg.sh +++ b/bin/reproducible_build_archlinux_pkg.sh @@ -333,8 +333,9 @@ if [ ! -z "$(ls $TMPDIR/b1/$SRCPACKAGE/*.pkg.tar.xz 2>/dev/null|| true)" ] ; the if diff -q $TMPDIR/b1/$SRCPACKAGE/$ARTIFACT $TMPDIR/b2/$SRCPACKAGE/$ARTIFACT ; then echo "$(date -u) - YAY - $SRCPACKAGE/$ARTIFACT build reproducible in our test framework!" mkdir -p $BASE/archlinux/$REPOSITORY/$SRCPACKAGE - echo "$SRCPACKAGE/$ARTIFACT build reproducible in our test framework:" > $BASE/archlinux/$REPOSITORY/$SRCPACKAGE/$ARTIFACT.html + echo "

$SRCPACKAGE/$ARTIFACT build reproducible in our test framework:
" > $BASE/archlinux/$REPOSITORY/$SRCPACKAGE/$ARTIFACT.html (cd $TMPDIR/b1/ ; sha256sum $SRCPACKAGE/$ARTIFACT >> $BASE/archlinux/$REPOSITORY/$SRCPACKAGE/$ARTIFACT.html ) + echo "

" > $BASE/archlinux/$REPOSITORY/$SRCPACKAGE/$ARTIFACT.html else # run diffoscope on the results TIMEOUT="30m" diff --git a/bin/reproducible_html_archlinux.sh b/bin/reproducible_html_archlinux.sh index fa2987de..80696a28 100755 --- a/bin/reproducible_html_archlinux.sh +++ b/bin/reproducible_html_archlinux.sh @@ -121,7 +121,7 @@ for REPOSITORY in $ARCHLINUX_REPOS ; do else HTML_TARGET=$HTML_GOOD for ARTIFACT in $(cd $ARCHLINUX_PKG_PATH/ ; ls *.pkg.tar.xz.html) ; do - if [ ! -z "$(grep 'build reproducible in our test framework' $ARCHLINUX_PKG_PATH/$ARTIFACT.html)" ] ; then + if [ ! -z "$(grep 'build reproducible in our test framework' $ARCHLINUX_PKG_PATH/$ARTIFACT)" ] ; then let NR_GOOD+=1 echo " $\"reproducible$ ${ARTIFACT:0:-5} is reproducible
" >> $HTML_BUFFER else -- cgit v1.2.3-54-g00ecf