From da205d0c42ee816cf341c22e5392c56efe1a7573 Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Sat, 18 Oct 2014 15:06:42 +0200
Subject: reproducible: cleanup

---
 bin/reproducible_setup.sh | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/bin/reproducible_setup.sh b/bin/reproducible_setup.sh
index 2c31efbc..5466f755 100755
--- a/bin/reproducible_setup.sh
+++ b/bin/reproducible_setup.sh
@@ -33,11 +33,11 @@ else
 fi
 cd $WORKSPACE
 
-#
-# finally, setup pbuilder
-#
-TMPFILE=$(mktemp)
-cat > ${TMPFILE} <<- EOF
+create_setup_tmpfile() {
+	#
+	# script to configure a pbuilder chroot
+	#
+	cat > ${TMPFILE} <<- EOF
 #
 # this script is run within the pbuilder environment to further customize it
 #
@@ -79,10 +79,20 @@ echo
 for i in \$(dpkg -l |grep ^ii |awk -F' ' '{print \$2}'); do   apt-cache madison "\$i" | head -1 | grep reproducible.alioth.debian.org || true  ; done
 echo
 EOF
+}
+
+setup_pbuilder() {
 #
-# actually setup pbuilder
+# setup pbuilder for reproducible builds
 #
-sudo pbuilder --create --basetgz /var/cache/pbuilder/base-reproducible-new.tgz --distribution sid
-sudo pbuilder --execute --save-after-exec --basetgz /var/cache/pbuilder/base-reproducible-new.tgz -- ${TMPFILE}
-sudo mv /var/cache/pbuilder/base-reproducible-new.tgz /var/cache/pbuilder/base-reproducible.tgz
-rm ${TMPFILE}
+	echo "$(date) - creating /var/cache/pbuilder/${1}.tgz now..."
+	TMPFILE=$(mktemp)
+	create_setup_tmpfile
+	sudo pbuilder --create --basetgz /var/cache/pbuilder/${1}-new.tgz --distribution sid
+	sudo pbuilder --execute --save-after-exec --basetgz /var/cache/pbuilder/${1}-new.tgz -- ${TMPFILE}
+	sudo mv /var/cache/pbuilder/${1}-new.tgz /var/cache/pbuilder/${1}.tgz
+	rm ${TMPFILE}
+	echo
+}
+
+setup_pbuilder base-reproducible
-- 
cgit v1.2.3-70-g09d2