From: Matthias Krüger Date: Fri, 10 Mar 2017 11:31:49 +0000 (+0100) Subject: ./all update-maps: suppress warnings from verious tools if we fail to download map... X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fheads%2Fmatthiaskrgr%2Fmapdownload_nospam_on_failure;p=xonotic%2Fxonotic.git ./all update-maps: suppress warnings from verious tools if we fail to download map pk3. --- diff --git a/misc/tools/xonotic-map-compiler-autobuild b/misc/tools/xonotic-map-compiler-autobuild index bbcedec0..5c6c71ed 100755 --- a/misc/tools/xonotic-map-compiler-autobuild +++ b/misc/tools/xonotic-map-compiler-autobuild @@ -295,20 +295,20 @@ getthemap() M=$4 blobhash=$5 commithash=$6 - if mv "$bspdir_old/$M-$blobhash.pk3" "$bspdir/$M-$blobhash.pk3"; then + if mv "$bspdir_old/$M-$blobhash.pk3" "$bspdir/$M-$blobhash.pk3" >& /dev/null; then if unzip -l "$bspdir/$M-$blobhash.pk3" >/dev/null 2>&1; then return 0 fi fi - if ! wget -c -O "$bspdir/$M-$blobhash.pk3" "$url$M-$blobhash.pk3"; then - if ! curl -o "$bspdir/$M-$blobhash.pk3" "$url$M-$blobhash.pk3"; then - rm -f "$bspdir/$M-$blobhash.pk3" + if ! wget -c -O "$bspdir/$M-$blobhash.pk3" "$url$M-$blobhash.pk3" >& /dev/null; then + if ! curl -o "$bspdir/$M-$blobhash.pk3" "$url$M-$blobhash.pk3" >& /dev/null; then + rm -f "$bspdir/$M-$blobhash.pk3" >& /dev/null echo "WARNING: could not download $url$M-$blobhash.pk3, maybe not ready yet" getthemap_fail=true return 0 fi fi - if ! unzip -l "$bspdir/$M-$blobhash.pk3"; then + if ! unzip -l "$bspdir/$M-$blobhash.pk3" >& /dev/null; then rm -f "$bspdir/$M-$blobhash.pk3" echo "WARNING: could not download $url$M-$blobhash.pk3, invalid zip file" getthemap_fail=true