[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     5fd4217cded80abf580361e5d232b99f0fcb0902
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 13 14:15:04 2016 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Wed Jun 15 07:58:22 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=5fd4217c

bootstrap-prefix.sh: move up curl

  add -f option to test against download failures.

 scripts/bootstrap-prefix.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 9cda6b8..3c57b92 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -42,13 +42,13 @@ efetch() {
                        # curl, FreeBSD's fetch and ftp.
                        if [[ x$(type -t wget) == "xfile" ]] ; then
                                FETCH_COMMAND="wget"
-                       elif [[ x$(type -t ftp) == "xfile" ]] ; then
-                               FETCH_COMMAND="ftp"
                        elif [[ x$(type -t curl) == "xfile" ]] ; then
                                einfo "WARNING: curl doesn't fail when 
downloading fails, please check its output carefully!"
-                               FETCH_COMMAND="curl -L -O"
+                               FETCH_COMMAND="curl -f -L -O"
                        elif [[ x$(type -t fetch) == "xfile" ]] ; then
                                FETCH_COMMAND="fetch"
+                       elif [[ x$(type -t ftp) == "xfile" ]] ; then
+                               FETCH_COMMAND="ftp"
                        else
                                eerror "no suitable download manager found 
(need wget, curl, fetch or ftp)"
                                eerror "could not download ${1##*/}"