From dda351daac41d67d088164bafc22f5bf8d3b9080 Mon Sep 17 00:00:00 2001 From: gdm85 Date: Wed, 11 Jun 2014 16:29:24 +0200 Subject: [PATCH] * always remove destination of input downloads * fixed move command after gbuilds --- docker/gitian-bitcoin-host/build-bitcoin.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docker/gitian-bitcoin-host/build-bitcoin.sh b/docker/gitian-bitcoin-host/build-bitcoin.sh index 58cdfee..ab88d12 100755 --- a/docker/gitian-bitcoin-host/build-bitcoin.sh +++ b/docker/gitian-bitcoin-host/build-bitcoin.sh @@ -27,7 +27,9 @@ while read -r URL FNAME; do if [ -z "$URL" ]; then continue fi - echo "wget -q --continue --no-check-certificate '$URL' -O '$FNAME'" + ## always remove destination. This is because we can't use --continue with SourceForge for example (infinite redirects) + rm "$FNAME" || exit $? + echo "wget -q --no-check-certificate '$URL' -O '$FNAME'" done < ../../input-sources/${VERSION}-inputs.txt | parallel -j10 || exit $? ## verify that all sources are correct before continuing @@ -35,7 +37,7 @@ md5sum -c < ../../input-sources/${VERSION}-inputs.md5 && \ cd .. && \ for DESC in $(<../input-sources/${VERSION}-descriptors.txt); do ./bin/gbuild ../bitcoin/contrib/gitian-descriptors/${DESC}.yml && \ - mv build/out/*.zip inputs/ || exit $? + mv -v $(find build/out -type f -name '*gz' -o -name '*.zip') inputs/ || exit $? done && \ ./bin/gbuild --commit bitcoin=v${VERSION} ../bitcoin/contrib/gitian-descriptors/gitian-linux.yml && \ echo "Completed successfully." && \