From 68f7984a85d26dbccefcbf27e1e2cd5716aace4f Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Tue, 23 Sep 2014 23:58:50 +0200 Subject: reproducible: more minor misc fixes --- bin/reproducible_build.sh | 9 +++++---- bin/reproducible_setup.sh | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'bin') diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index 23038937..bde4d563 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -28,10 +28,11 @@ for PACKAGE in "$@" ; do sudo pbuilder --build --basetgz /var/cache/pbuilder/base-reproducible.tgz ${PACKAGE}_*.dsc dcmd cp /var/cache/pbuilder/result/${PACKAGE}_*.changes b2 sudo dcmd rm /var/cache/pbuilder/result/${PACKAGE}_*.changes + cat b1/${PACKAGE}_*.changes TMPFILE=$(mktemp) - ./misc.git/diffp b1/*.changes b2/*.changes | tee $TMPFILE - if grep -qv '^\*\*\*\*\*' $TMPFILE ; then + ./misc.git/diffp b1/*.changes b2/*.changes | tee ${TMPFILE} + if grep -qv '^\*\*\*\*\*' ${TMPFILE} ; then figlet ${PACKAGE} echo echo "${PACKAGE} build successfull." @@ -41,12 +42,12 @@ for PACKAGE in "$@" ; do let "COUNT_BAD=COUNT_BAD+1" fi - rm b1 b2 $TMPFILE -rf + rm b1 b2 ${TMPFILE} -rf done echo echo "$COUNT_TOTAL packages attempted to build in total." echo "$COUNT_GOOD packages successfully built reproducible." -echo "$COUNT_GOOD packages failed to built reproducible." +echo "$COUNT_BAD packages failed to built reproducible." echo echo "The full list of packages: $@" diff --git a/bin/reproducible_setup.sh b/bin/reproducible_setup.sh index 3cd89485..ad0e6cd2 100755 --- a/bin/reproducible_setup.sh +++ b/bin/reproducible_setup.sh @@ -14,7 +14,7 @@ echo "Warning: Usage of --force-yes to override the apt authentication warning. apt-get install --force-yes -y dpkg dpkg-dev debhelper dh-python discount EOF -sudo rm /var/cache/pbuilder/base-reproducible.tgz +sudo rm /var/cache/pbuilder/base-reproducible.tgz || true sudo pbuilder --create --basetgz /var/cache/pbuilder/base-reproducible.tgz --distribution sid -sudo pbuilder --execute --save-after-exec --basetgz /var/cache/pbuilder/base-reproducible.tgz -- +sudo pbuilder --execute --save-after-exec --basetgz /var/cache/pbuilder/base-reproducible.tgz -- $TMPFILE rm $TMPFILE -- cgit v1.2.3-70-g09d2