summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-10-16 19:51:17 +0200
committerHolger Levsen <holger@layer-acht.org>2015-10-16 19:51:17 +0200
commit20ab7c3aec153ce758686c9c67db86c46b449670 (patch)
tree07eae5a53231550c4297ccc9ac76864088e96cd6
parent0192d1df9a69ab11947f6c867f8e0bfcef23f14f (diff)
downloadjenkins.debian.net-20ab7c3aec153ce758686c9c67db86c46b449670.tar.xz
reproducible arch: correctly preserve results
-rwxr-xr-xbin/reproducible_build_arch_pkg.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/reproducible_build_arch_pkg.sh b/bin/reproducible_build_arch_pkg.sh
index e0534fd2..51cd6e3d 100755
--- a/bin/reproducible_build_arch_pkg.sh
+++ b/bin/reproducible_build_arch_pkg.sh
@@ -138,15 +138,15 @@ elif [ "$1" = "1" ] || [ "$1" = "2" ] ; then
TMPDIR="$3"
[ -d $TMPDIR ] || mkdir -p $TMPDIR
cd $TMPDIR
- mkdir -p b$MODE/archlinux/
+ mkdir -p b$MODE/archlinux/$SRCPACKAGE
if [ "$MODE" = "1" ] ; then
first_build
else
second_build
fi
- # delete source package before providing build results for rsyncing
- rm /tmp/$SRCPACKAGE-$(basename $TMPDIR)/$SRCPACKAGE -r
- mv -v /tmp/$SRCPACKAGE-$(basename $TMPDIR) $TMPDIR/b$MODE/archlinux/$SRCPACKAGE
+ # preserve results and delete build directory
+ mv -v /tmp/$SRCPACKAGE-$(basename $TMPDIR)/$SRCPACKAGE/*-x86_64.pkg.tar.?? $TMPDIR/b$MODE/archlinux/$SRCPACKAGE
+ rm -r /tmp/$SRCPACKAGE-$(basename $TMPDIR)/
echo "$(date -u) - build #$MODE for $SRCPACKAGE on $HOSTNAME done."
exit 0
fi