From: Tomi Ollila Date: Sun, 12 Mar 2017 12:59:33 +0000 (+0200) Subject: test-databases: use wget or curl to download test databases X-Git-Tag: 0.25_rc0~104 X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=9c3a27dee949f76ad4780c716142c22cd9ba4911 test-databases: use wget or curl to download test databases Often Linux systems are shipped with wget(1) by default (and no curl). Many BSDs, macOS, and e.g. some Linux minimal/container images comes with curl(1) (and no wget). Attempting to download with curl if wget is not available increases the likelihood for this to succeed. --- diff --git a/test/test-databases/Makefile.local b/test/test-databases/Makefile.local index dcc8863c..7aedff70 100644 --- a/test/test-databases/Makefile.local +++ b/test/test-databases/Makefile.local @@ -7,7 +7,13 @@ dir := test/test-databases test_databases := $(dir)/database-v1.tar.xz %.tar.xz: - wget -nv -O $@ ${TEST_DATABASE_MIRROR}/$(notdir $@); + @exec 1>&2 ;\ + if command -v wget >/dev/null ;\ + then set -x; wget -nv -O $@ ${TEST_DATABASE_MIRROR}/$(notdir $@) ;\ + elif command -v curl >/dev/null ;\ + then set -x; curl -L -s -o $@ ${TEST_DATABASE_MIRROR}/$(notdir $@) ;\ + else echo Cannot fetch databases, no wget nor curl available; exit 1 ;\ + fi download-test-databases: ${test_databases}