From 4ebba7cd5f33386e1ddbffe9e020be20f229c509 Mon Sep 17 00:00:00 2001 From: LWisteria Date: Wed, 29 Nov 2017 20:48:55 +0900 Subject: [PATCH] Check wget version iff wget is going to be used Do not check when tarball is cached --- plugins/python-build/bin/python-build | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/plugins/python-build/bin/python-build b/plugins/python-build/bin/python-build index 6868bf56..f47c1e89 100755 --- a/plugins/python-build/bin/python-build +++ b/plugins/python-build/bin/python-build @@ -330,6 +330,11 @@ http() { elif type curl &>/dev/null; then "http_${method}_curl" "$url" "$file" elif type wget &>/dev/null; then + # SSL Certificate error with older wget that does not support Server Name Indication (#60) + if [[ "$(wget --version 2>/dev/null || true)" = "GNU Wget 1.1"[0-3]* ]]; then + echo "python-build: wget (< 1.14) doesn't support Server Name Indication. Please install curl (>= 7.18.1) and try again" >&2 + return 1 + fi "http_${method}_wget" "$url" "$file" else echo "error: please install \`aria2c\`, \`curl\` or \`wget\` and try again" >&2 @@ -2051,12 +2056,6 @@ if [[ "$PYTHON_CONFIGURE_OPTS" != *"--enable-unicode="* ]]; then fi fi -# SSL Certificate error with older wget that does not support Server Name Indication (#60) -if ! command -v curl 1>/dev/null 2>&1 && [[ "$(wget --version 2>/dev/null || true)" = "GNU Wget 1.1"[0-3]* ]]; then - echo "python-build: wget (< 1.14) doesn't support Server Name Indication. Please install curl (>= 7.18.1) and try again" >&2 - exit 1 -fi - # Unset `PIP_REQUIRE_VENV` during build (#216) unset PIP_REQUIRE_VENV unset PIP_REQUIRE_VIRTUALENV