From cd8f61b5e028fb236a25723a0e7092f3321c5c27 Mon Sep 17 00:00:00 2001
From: "Yamashita, Yuu" <peek824545201@gmail.com>
Date: Sat, 13 Feb 2016 02:50:51 +0000
Subject: [PATCH] Allow overriding aria2c/curl/wget via environment variable
 (#534)

---
 plugins/python-build/bin/python-build   | 34 ++++++++-----------------
 plugins/python-build/test/cache.bats    |  1 +
 plugins/python-build/test/checksum.bats |  1 +
 plugins/python-build/test/mirror.bats   |  1 +
 4 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/plugins/python-build/bin/python-build b/plugins/python-build/bin/python-build
index 3f325ecd..6250d907 100755
--- a/plugins/python-build/bin/python-build
+++ b/plugins/python-build/bin/python-build
@@ -336,45 +336,27 @@ http() {
 }
 
 http_head_aria2c() {
-  options=""
-  [ -n "${IPV4}" ] && options="--disable-ipv6=true"
-  [ -n "${IPV6}" ] && options="--disable-ipv6=false"
-  aria2c --dry-run  ${options} "$1" >&4 2>&1
+  aria2c --dry-run  ${ARIA2_OPTS} "$1" >&4 2>&1
 }
 
 http_get_aria2c() {
-  options=""
-  [ -n "${IPV4}" ] && options="--disable-ipv6=true"
-  [ -n "${IPV6}" ] && options="--disable-ipv6=false"
-  aria2c -o "${2:--}" ${options} "$1"
+  aria2c -o "${2:--}" ${ARIA2_OPTS} "$1"
 }
 
 http_head_curl() {
-  options=""
-  [ -n "${IPV4}" ] && options="--ipv4"
-  [ -n "${IPV6}" ] && options="--ipv6"
-  curl -qsILf ${options} "$1" >&4 2>&1
+  curl -qsILf ${CURL_OPTS} "$1" >&4 2>&1
 }
 
 http_get_curl() {
-  options=""
-  [ -n "${IPV4}" ] && options="--ipv4"
-  [ -n "${IPV6}" ] && options="--ipv6"
-  curl -q -o "${2:--}" -sSLf ${options} "$1"
+  curl -q -o "${2:--}" -sSLf ${CURL_OPTS} "$1"
 }
 
 http_head_wget() {
-  options=""
-  [ -n "${IPV4}" ] && options="--inet4-only"
-  [ -n "${IPV6}" ] && options="--inet6-only"
-  wget -q --spider ${options} "$1" >&4 2>&1
+  wget -q --spider ${WGET_OPTS} "$1" >&4 2>&1
 }
 
 http_get_wget() {
-  options=""
-  [ -n "${IPV4}" ] && options="--inet4-only"
-  [ -n "${IPV6}" ] && options="--inet6-only"
-  wget -nv ${options} -O "${2:--}" "$1"
+  wget -nv ${WGET_OPTS} -O "${2:--}" "$1"
 }
 
 fetch_tarball() {
@@ -1816,6 +1798,10 @@ if [ -n "$PYTHON_BUILD_SKIP_MIRROR" ] || ! has_checksum_support compute_sha2; th
   unset PYTHON_BUILD_MIRROR_URL
 fi
 
+ARIA2_OPTS="${PYTHON_BUILD_ARIA2_OPTS} ${IPV4+--disable-ipv6=true} ${IPV6+--disable-ipv6=false}"
+CURL_OPTS="${PYTHON_BUILD_CURL_OPTS} ${IPV4+--ipv4} ${IPV6+--ipv6}"
+WGET_OPTS="${PYTHON_BUILD_WGET_OPTS} ${IPV4+--inet4-only} ${IPV6+--inet6-only}"
+
 # Add an option to build a debug version of Python (#11)
 if [ -n "$DEBUG" ]; then
   package_option python configure --with-pydebug
diff --git a/plugins/python-build/test/cache.bats b/plugins/python-build/test/cache.bats
index c810903f..d8f8662b 100644
--- a/plugins/python-build/test/cache.bats
+++ b/plugins/python-build/test/cache.bats
@@ -3,6 +3,7 @@
 load test_helper
 export PYTHON_BUILD_SKIP_MIRROR=1
 export PYTHON_BUILD_CACHE_PATH="$TMP/cache"
+unset PYTHON_BUILD_ARIA2_OPTS
 
 setup() {
   mkdir "$PYTHON_BUILD_CACHE_PATH"
diff --git a/plugins/python-build/test/checksum.bats b/plugins/python-build/test/checksum.bats
index a9b0ca25..1af9c722 100644
--- a/plugins/python-build/test/checksum.bats
+++ b/plugins/python-build/test/checksum.bats
@@ -3,6 +3,7 @@
 load test_helper
 export PYTHON_BUILD_SKIP_MIRROR=1
 export PYTHON_BUILD_CACHE_PATH=
+unset PYTHON_BUILD_ARIA2_OPTS
 
 
 @test "package URL without checksum" {
diff --git a/plugins/python-build/test/mirror.bats b/plugins/python-build/test/mirror.bats
index 3310728d..fbffaf7c 100644
--- a/plugins/python-build/test/mirror.bats
+++ b/plugins/python-build/test/mirror.bats
@@ -4,6 +4,7 @@ load test_helper
 export PYTHON_BUILD_SKIP_MIRROR=
 export PYTHON_BUILD_CACHE_PATH=
 export PYTHON_BUILD_MIRROR_URL=http://mirror.example.com
+unset PYTHON_BUILD_ARIA2_OPTS
 
 
 @test "package URL without checksum bypasses mirror" {