From 9d2b25f3ce3eb552f969f2a03bcccb5536ff71b7 Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Mon, 12 Oct 2015 23:58:38 +0200
Subject: reproducible: refactor

---
 bin/reproducible_build.sh    | 2 +-
 bin/reproducible_common.sh   | 1 +
 bin/reproducible_coreboot.sh | 1 -
 bin/reproducible_freebsd.sh  | 1 -
 bin/reproducible_netbsd.sh   | 1 -
 bin/reproducible_openwrt.sh  | 1 -
 6 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'bin')

diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index c00b6ca5..02623b3b 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -320,7 +320,7 @@ call_diffoscope_on_changes_files() {
 	local TIMEOUT="30m"
 	DBDSUITE=$SUITE
 	if [ "$SUITE" = "experimental" ] ; then
-		# there is no extra diffoscope-schroot for experimental because we specical case ghc enough already ;)
+		# there is no extra diffoscope-schroot for experimental ( because we specical case ghc enough already )
 		DBDSUITE="unstable"
 	fi
 	set -x # FIXME: to debug diffopscpe/schroot problems
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index 254df4ac..66d6b93b 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -38,6 +38,7 @@ REPRODUCIBLE_URL=https://reproducible.debian.net
 REPRODUCIBLE_DOT_ORG_URL=https://reproducible-builds.org
 # shop trailing slash
 JENKINS_URL=${JENKINS_URL:0:-1}
+DBDSUITE="unstable"
 
 # suites being tested
 SUITES="testing unstable experimental"
diff --git a/bin/reproducible_coreboot.sh b/bin/reproducible_coreboot.sh
index 0ea0b360..5bb20b54 100755
--- a/bin/reproducible_coreboot.sh
+++ b/bin/reproducible_coreboot.sh
@@ -152,7 +152,6 @@ rm -r $TMPBUILDDIR/coreboot
 
 # run diffoscope on the results
 TIMEOUT="30m"
-DBDSUITE="unstable"
 DIFFOSCOPE="$(schroot --directory /tmp -c source:jenkins-reproducible-${DBDSUITE}-diffoscope diffoscope -- --version 2>&1)"
 echo "============================================================================="
 echo "$(date -u) - Running $DIFFOSCOPE on coreboot images."
diff --git a/bin/reproducible_freebsd.sh b/bin/reproducible_freebsd.sh
index 1c17402f..d41bd89e 100755
--- a/bin/reproducible_freebsd.sh
+++ b/bin/reproducible_freebsd.sh
@@ -110,7 +110,6 @@ umask 0022
 
 # run diffoscope on the results
 TIMEOUT="30m"
-DBDSUITE="unstable"
 DIFFOSCOPE="$(schroot --directory /tmp -c source:jenkins-reproducible-${DBDSUITE}-diffoscope diffoscope -- --version 2>&1)"
 echo "============================================================================="
 echo "$(date -u) - Running $DIFFOSCOPE on freebsd..."
diff --git a/bin/reproducible_netbsd.sh b/bin/reproducible_netbsd.sh
index 9aa35869..86d67136 100755
--- a/bin/reproducible_netbsd.sh
+++ b/bin/reproducible_netbsd.sh
@@ -119,7 +119,6 @@ rm -r $TMPBUILDDIR/netbsd
 
 # run diffoscope on the results
 TIMEOUT="30m"
-DBDSUITE="unstable"
 DIFFOSCOPE="$(schroot --directory /tmp -c source:jenkins-reproducible-${DBDSUITE}-diffoscope diffoscope -- --version 2>&1)"
 echo "============================================================================="
 echo "$(date -u) - Running $DIFFOSCOPE on netbsd..."
diff --git a/bin/reproducible_openwrt.sh b/bin/reproducible_openwrt.sh
index 0c851bef..e855d7c7 100755
--- a/bin/reproducible_openwrt.sh
+++ b/bin/reproducible_openwrt.sh
@@ -204,7 +204,6 @@ rm -r $TMPBUILDDIR/openwrt
 # run diffoscope on the results
 # (this needs refactoring rather badly)
 TIMEOUT="30m"
-DBDSUITE="unstable"
 DIFFOSCOPE="$(schroot --directory /tmp -c source:jenkins-reproducible-${DBDSUITE}-diffoscope diffoscope -- --version 2>&1)"
 echo "============================================================================="
 echo "$(date -u) - Running $DIFFOSCOPE on OpenWrt images and packages."
-- 
cgit v1.2.3-70-g09d2