reproducible: s#$DBDVERSION#$DIFFOSCOPE#g

6 files changed, 29 insertions, 29 deletions

diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index dc4690c2..ba6a2722 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -82,7 +82,7 @@ save_artifacts() {
 		if [ ! -z "$NOTIFY" ] ; then
 			local MESSAGE="$URL published"
 			if [ "$NOTIFY" = "diffoscope" ] ; then
-				MESSAGE="$MESSAGE, $DBDVERSION had troubles with these..."
+				MESSAGE="$MESSAGE, $DIFFOSCOPE had troubles with these..."
 			fi
 			irc_message "$MESSAGE"
 		fi
@@ -235,7 +235,7 @@ handle_ftbr() {
 	if [ -f ./${DBDREPORT} ] ; then
 		mv ./${DBDREPORT} $BASE/dbd/${SUITE}/${ARCH}/
 	else
-		echo "$(date) - $DBDVERSION produced no output (which is strange)." | tee -a $RBUILDLOG
+		echo "$(date) - $DIFFOSCOPE produced no output (which is strange)." | tee -a $RBUILDLOG
 	fi
 	if [ -f ./$DBDTXT ] ; then
 		mv ./$DBDTXT $BASE/dbdtxt/$SUITE/$ARCH/
@@ -250,7 +250,7 @@ handle_reproducible() {
 		cp b1/${BUILDINFO} $BASE/buildinfo/${SUITE}/${ARCH}/ > /dev/null 2>&1
 		figlet ${SRCPACKAGE}
 		echo | tee -a ${RBUILDLOG}
-		echo "$DBDVERSION found no differences in the changes files, and a .buildinfo file also exists." | tee -a ${RBUILDLOG}
+		echo "$DIFFOSCOPE found no differences in the changes files, and a .buildinfo file also exists." | tee -a ${RBUILDLOG}
 		echo "${SRCPACKAGE} from $SUITE built successfully and reproducibly on ${ARCH}." | tee -a ${RBUILDLOG}
 		calculate_build_duration
 		update_db_and_html "reproducible"
@@ -264,9 +264,9 @@ handle_reproducible() {
 }
 
 dbd_timeout() {
-	local msg="$DBDVERSION was killed after running into timeout after $1"
+	local msg="$DIFFOSCOPE was killed after running into timeout after $1"
 	if [ ! -s ./${DBDREPORT} ] ; then
-		echo "$(date) - $DBDVERSION produced no output and was killed after running into timeout after ${1}..." >> ${DBDREPORT}
+		echo "$(date) - $DIFFOSCOPE produced no output and was killed after running into timeout after ${1}..." >> ${DBDREPORT}
 	else
 		msg="$msg, but there is still $REPRODUCIBLE_URL/dbd/$SUITE/$ARCH/$DDBREPORT"
 	fi
@@ -286,8 +286,8 @@ call_diffoscope_on_changes_files() {
 	fi
 	# TEMP is recognized by python's tempfile module to create temp stuff inside
 	local TEMP=$(mktemp --tmpdir=$TMPDIR -d dbd-tmp-XXXXXXX)
-	DBDVERSION="$(schroot --directory /tmp -c source:jenkins-reproducible-${DBDSUITE}-debbindiff debbindiff -- --version 2>&1)"
-	echo "$(date) - $DBDVERSION will be used to compare the two builds:" | tee -a ${RBUILDLOG}
+	DIFFOSCOPE="$(schroot --directory /tmp -c source:jenkins-reproducible-${DBDSUITE}-debbindiff debbindiff -- --version 2>&1)"
+	echo "$(date) - $DIFFOSCOPE will be used to compare the two builds:" | tee -a ${RBUILDLOG}
 	set +e
 	set -x
 	( timeout $TIMEOUT schroot \
@@ -310,19 +310,19 @@ call_diffoscope_on_changes_files() {
 			handle_reproducible
 			;;
 		1)
-			handle_ftbr "$DBDVERSION found issues, please investigate $REPRODUCIBLE_URL/dbd/${SUITE}/${ARCH}/${DBDREPORT}"
+			handle_ftbr "$DIFFOSCOPE found issues, please investigate $REPRODUCIBLE_URL/dbd/${SUITE}/${ARCH}/${DBDREPORT}"
 			;;
 		2)
 			SAVE_ARTIFACTS=1
 			NOTIFY="diffoscope"
-			handle_ftbr "$DBDVERSION had trouble comparing the two builds. Please investigate $REPRODUCIBLE_URL/rbuild/${SUITE}/${ARCH}/${SRCPACKAGE}_${EVERSION}.rbuild.log"
+			handle_ftbr "$DIFFOSCOPE had trouble comparing the two builds. Please investigate $REPRODUCIBLE_URL/rbuild/${SUITE}/${ARCH}/${SRCPACKAGE}_${EVERSION}.rbuild.log"
 			;;
 		124)
 			dbd_timeout $TIMEOUT
 			;;
 		*)
-			handle_ftbr "Something weird happened when running $DBDVERSION (which exited with $RESULT) and I don't know how to handle it"
-			irc_message "Something weird happened when running $DBDVERSION (which exited with $RESULT) and I don't know how to handle it. Check $BUILDLOG and $REPRODUCIBLE_URL/$SUITE/$ARCH/$SRCPACKAGE and investigate manually"
+			handle_ftbr "Something weird happened when running $DIFFOSCOPE (which exited with $RESULT) and I don't know how to handle it"
+			irc_message "Something weird happened when running $DIFFOSCOPE (which exited with $RESULT) and I don't know how to handle it. Check $BUILDLOG and $REPRODUCIBLE_URL/$SUITE/$ARCH/$SRCPACKAGE and investigate manually"
 			;;
 	esac
 	print_out_duration
@@ -561,7 +561,7 @@ update_rbuildlog
 if [ $FTBFS -eq 1 ] ; then
 	handle_ftbfs
 elif [ $FTBFS -eq 0 ] ; then
-	call_diffoscope_on_changes_files  # defines DBDVERSION, update_db_and_html defines STATUS
+	call_diffoscope_on_changes_files  # defines DIFFOSCOPE, update_db_and_html defines STATUS
 fi
 
 check_for_race_conditions
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index a87bc81d..fcee0bed 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -393,20 +393,20 @@ call_diffoscope() {
 		0)	echo "$(date -u) - $1/$2 is reproducible, yay!"
 			;;
 		1)
-			echo "$(date -u) - $DBDVERSION found issues, please investigate $1/$2"
+			echo "$(date -u) - $DIFFOSCOPE found issues, please investigate $1/$2"
 			;;
 		2)
-			msg="$(date -u) - $DBDVERSION had trouble comparing the two builds. Please investigate $1/$2"
+			msg="$(date -u) - $DIFFOSCOPE had trouble comparing the two builds. Please investigate $1/$2"
 			;;
 		124)
 			if [ ! -s $TMPDIR/$1.html ] ; then
-				msg="$(date -u) - $DBDVERSION produced no output for $1/$2 and was killed after running into timeout after ${TIMEOUT}..."
+				msg="$(date -u) - $DIFFOSCOPE produced no output for $1/$2 and was killed after running into timeout after ${TIMEOUT}..."
 			else
-				msg="$DBDVERSION was killed after running into timeout after $TIMEOUT, but there is still $TMPDIR/$1/$2.html"
+				msg="$DIFFOSCOPE was killed after running into timeout after $TIMEOUT, but there is still $TMPDIR/$1/$2.html"
 			fi
 			;;
 		*)
-			msg="$(date -u) - Something weird happened when running $DBDVERSION on $1/$2 (which exited with $RESULT) and I don't know how to handle it."
+			msg="$(date -u) - Something weird happened when running $DIFFOSCOPE on $1/$2 (which exited with $RESULT) and I don't know how to handle it."
 			;;
 	esac
 	if [ ! -z "$msg" ] ; then
diff --git a/bin/reproducible_coreboot.sh b/bin/reproducible_coreboot.sh
index fb7e011b..bb8c024a 100755
--- a/bin/reproducible_coreboot.sh
+++ b/bin/reproducible_coreboot.sh
@@ -151,9 +151,9 @@ rm -r $TMPBUILDDIR/coreboot
 # run diffoscope on the results
 TIMEOUT="30m"
 DBDSUITE="unstable"
-DBDVERSION="$(schroot --directory /tmp -c source:jenkins-reproducible-${DBDSUITE}-debbindiff debbindiff -- --version 2>&1)"
+DIFFOSCOPE="$(schroot --directory /tmp -c source:jenkins-reproducible-${DBDSUITE}-debbindiff debbindiff -- --version 2>&1)"
 echo "============================================================================="
-echo "$(date -u) - Running $DBDVERSION on coreboot images."
+echo "$(date -u) - Running $DIFFOSCOPE on coreboot images."
 echo "============================================================================="
 ROMS_HTML=$(mktemp --tmpdir=$TMPDIR)
 echo "       <ul>" > $ROMS_HTML
@@ -225,7 +225,7 @@ if [ "$GOOD_PERCENT" = "100.0" ] ; then
 else
 	write_page ", while $BAD_ROMS ($BAD_PERCENT%) failed to build from source."
 fi
-write_page "        These tests were last run on $DATE for version ${COREBOOT_VERSION} using ${DBDVERSION}.</p>"
+write_page "        These tests were last run on $DATE for version ${COREBOOT_VERSION} using ${DIFFOSCOPE}.</p>"
 write_explaination_table coreboot
 cat $ROMS_HTML >> $PAGE
 write_page "     <p><pre>"
diff --git a/bin/reproducible_freebsd.sh b/bin/reproducible_freebsd.sh
index b4d90df8..708deabe 100755
--- a/bin/reproducible_freebsd.sh
+++ b/bin/reproducible_freebsd.sh
@@ -114,9 +114,9 @@ $RSSH 'sudo rm -r /usr/src /usr/obj'
 # run diffoscope on the results
 TIMEOUT="30m"
 DBDSUITE="unstable"
-DBDVERSION="$(schroot --directory /tmp -c source:jenkins-reproducible-${DBDSUITE}-debbindiff debbindiff -- --version 2>&1)"
+DIFFOSCOPE="$(schroot --directory /tmp -c source:jenkins-reproducible-${DBDSUITE}-debbindiff debbindiff -- --version 2>&1)"
 echo "============================================================================="
-echo "$(date -u) - Running $DBDVERSION on freebsd..."
+echo "$(date -u) - Running $DIFFOSCOPE on freebsd..."
 echo "============================================================================="
 FILES_HTML=$(mktemp --tmpdir=$TMPDIR)
 echo "       <ul>" > $FILES_HTML
@@ -184,7 +184,7 @@ if [ "$GOOD_PERCENT" = "100.0" ] ; then
 else
 	write_page "."
 fi
-write_page "        These tests were last run on $DATE for version ${FREEBSD_VERSION} using ${DBDVERSION}.</p>"
+write_page "        These tests were last run on $DATE for version ${FREEBSD_VERSION} using ${DIFFOSCOPE}.</p>"
 write_explaination_table FreeBSD
 cat $FILES_HTML >> $PAGE
 write_page "     <p><pre>"
diff --git a/bin/reproducible_netbsd.sh b/bin/reproducible_netbsd.sh
index 151c4acc..b3ba1b56 100755
--- a/bin/reproducible_netbsd.sh
+++ b/bin/reproducible_netbsd.sh
@@ -120,9 +120,9 @@ rm -r $TMPBUILDDIR/netbsd
 # run diffoscope on the results
 TIMEOUT="30m"
 DBDSUITE="unstable"
-DBDVERSION="$(schroot --directory /tmp -c source:jenkins-reproducible-${DBDSUITE}-debbindiff debbindiff -- --version 2>&1)"
+DIFFOSCOPE="$(schroot --directory /tmp -c source:jenkins-reproducible-${DBDSUITE}-debbindiff debbindiff -- --version 2>&1)"
 echo "============================================================================="
-echo "$(date -u) - Running $DBDVERSION on netbsd..."
+echo "$(date -u) - Running $DIFFOSCOPE on netbsd..."
 echo "============================================================================="
 FILES_HTML=$(mktemp --tmpdir=$TMPDIR)
 echo "       <ul>" > $FILES_HTML
@@ -190,7 +190,7 @@ if [ "$GOOD_PERCENT" = "100.0" ] ; then
 else
 	write_page "."
 fi
-write_page "        These tests were last run on $DATE for version ${NETBSD_VERSION} using ${DBDVERSION}.</p>"
+write_page "        These tests were last run on $DATE for version ${NETBSD_VERSION} using ${DIFFOSCOPE}.</p>"
 write_explaination_table NetBSD
 cat $FILES_HTML >> $PAGE
 write_page "     <p><pre>"
diff --git a/bin/reproducible_openwrt.sh b/bin/reproducible_openwrt.sh
index d9daca64..8caf986a 100755
--- a/bin/reproducible_openwrt.sh
+++ b/bin/reproducible_openwrt.sh
@@ -205,9 +205,9 @@ rm -r $TMPBUILDDIR/openwrt
 # (this needs refactoring rather badly)
 TIMEOUT="30m"
 DBDSUITE="unstable"
-DBDVERSION="$(schroot --directory /tmp -c source:jenkins-reproducible-${DBDSUITE}-debbindiff debbindiff -- --version 2>&1)"
+DIFFOSCOPE="$(schroot --directory /tmp -c source:jenkins-reproducible-${DBDSUITE}-debbindiff debbindiff -- --version 2>&1)"
 echo "============================================================================="
-echo "$(date -u) - Running $DBDVERSION on OpenWrt images and packages."
+echo "$(date -u) - Running $DIFFOSCOPE on OpenWrt images and packages."
 echo "============================================================================="
 DBD_HTML=$(mktemp --tmpdir=$TMPDIR)
 # run diffoscope on the images
@@ -322,7 +322,7 @@ write_page "     </div><div id=\"main-content\">"
 write_page "       <h1>OpenWrt - <em>reproducible</em> wireless freedom$MAGIC_SIGN</h1>"
 write_page_intro OpenWrt
 write_page "       <p>$GOOD_IMAGES ($GOOD_PERCENT_IMAGES%) out of $ALL_IMAGES built images and $GOOD_PACKAGES ($GOOD_PERCENT_PACKAGES%) out of $ALL_PACKAGES built packages were reproducible in our test setup."
-write_page "        These tests were last run on $DATE for version ${OPENWRT_VERSION} using ${DBDVERSION}.</p>"
+write_page "        These tests were last run on $DATE for version ${OPENWRT_VERSION} using ${DIFFOSCOPE}.</p>"
 write_explaination_table OpenWrt
 cat $DBD_HTML >> $PAGE
 write_page "     <table><tr><th>git commit built</th></tr><tr><td><code>"