From 11fc9aaf0139c4617df303e7834a455e24b8a389 Mon Sep 17 00:00:00 2001 From: kpcyrd Date: Sat, 18 Nov 2017 18:49:42 +0100 Subject: reproducible-archlinux: fix lost packages Signed-off-by: Holger Levsen --- bin/reproducible_build_archlinux_pkg.sh | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/bin/reproducible_build_archlinux_pkg.sh b/bin/reproducible_build_archlinux_pkg.sh index b8ff01c7..3efafa38 100755 --- a/bin/reproducible_build_archlinux_pkg.sh +++ b/bin/reproducible_build_archlinux_pkg.sh @@ -294,11 +294,16 @@ elif [ "$1" = "1" ] || [ "$1" = "2" ] ; then else second_build fi - # preserve results and delete build directory - mv -v /tmp/$SRCPACKAGE-$(basename $TMPDIR)/$SRCPACKAGE/*.pkg.tar.xz $TMPDIR/b$MODE/$SRCPACKAGE/ || ls /tmp/$SRCPACKAGE-$(basename $TMPDIR)/$SRCPACKAGE/ - rm -r /tmp/$SRCPACKAGE-$(basename $TMPDIR)/ - echo "$(date -u) - build #$MODE for $SRCPACKAGE on $HOSTNAME done." - exit 0 + + # preserve results and delete build directory + if ! mv -v /tmp/$SRCPACKAGE-$(basename $TMPDIR)/$SRCPACKAGE/trunk/*.pkg.tar.xz $TMPDIR/b$MODE/$SRCPACKAGE/; then + echo "$(date -u) - build #$MODE for $SRCPACKAGE on $HOSTNAME didn't build a package!" + find /tmp/$SRCPACKAGE-$(basename $TMPDIR)/$SRCPACKAGE/ + fi + + rm -r /tmp/$SRCPACKAGE-$(basename $TMPDIR)/ + echo "$(date -u) - build #$MODE for $SRCPACKAGE on $HOSTNAME done." + exit 0 fi # -- cgit v1.2.3-54-g00ecf