From 1db2db7783bd7ec2aa1da86e640019891634c659 Mon Sep 17 00:00:00 2001 From: Joakim Roubert Date: Fri, 16 Aug 2019 07:52:48 +0200 Subject: [PATCH] Use curl instead of wget When curl's MIT license is preferable to wget's GPLv3. Change-Id: I4684ae7569704514fdcc63e0655c556efcaf44f8 Signed-off-by: Joakim Roubert Signed-off-by: Yanfei Xu --- templates/lxc-download.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) Index: git/templates/lxc-download.in =================================================================== --- git.orig/templates/lxc-download.in +++ git/templates/lxc-download.in @@ -59,9 +59,9 @@ fi } -wget_wrapper() { +curl_wrapper() { for _ in $(seq 3); do - if wget "$@"; then + if curl "$@"; then return 0 fi done @@ -70,8 +70,9 @@ } download_file() { - if ! wget_wrapper --user-agent="lxc/@PACKAGE_VERSION@ compat:${DOWNLOAD_COMPAT_LEVEL}" -T 30 -q "https://${DOWNLOAD_SERVER}/$1" -O "$2" >/dev/null 2>&1; then - if [ "$3" = "noexit" ]; then + if ! curl_wrapper --user-agent="lxc/@PACKAGE_VERSION@ compat:${DOWNLOAD_COMPAT_LEVEL}" -m 30 -s "https://${DOWNLOAD_SERVER}/$1" -o "$2" >/dev/null 2>&1; then + if ! curl_wrapper --user-agent="lxc/@PACKAGE_VERSION@ compat:${DOWNLOAD_COMPAT_LEVEL}" -m 30 -s "http://${DOWNLOAD_SERVER}/$1" -o "$2" >/dev/null 2>&1; then + if [ "$3" = "noexit" ]; then return 1 else echo "ERROR: Failed to download https://${DOWNLOAD_SERVER}/$1" 1>&2 @@ -176,7 +177,7 @@ done # Check for required binaries -for bin in tar xz wget; do +for bin in tar xz curl; do if ! command -V "${bin}" >/dev/null 2>&1; then echo "ERROR: Missing required tool: ${bin}" 1>&2 exit 1