Allow specifying custom command line options for aria2c, curl and wget

This commit is contained in:
Yamashita, Yuu 2016-02-13 03:51:31 +00:00
parent 54286dcb7e
commit f998f10597
4 changed files with 13 additions and 24 deletions

View file

@ -313,45 +313,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() {
@ -1235,6 +1217,10 @@ if [ -n "$RUBY_BUILD_SKIP_MIRROR" ] || ! has_checksum_support compute_sha2; then
unset RUBY_BUILD_MIRROR_URL
fi
ARIA2_OPTS="${RUBY_BUILD_ARIA2_OPTS} ${IPV4+--disable-ipv6=true} ${IPV6+--disable-ipv6=false}"
CURL_OPTS="${RUBY_BUILD_CURL_OPTS} ${IPV4+--ipv4} ${IPV6+--ipv6}"
WGET_OPTS="${RUBY_BUILD_WGET_OPTS} ${IPV4+--inet4-only} ${IPV6+--inet6-only}"
SEED="$(date "+%Y%m%d%H%M%S").$$"
LOG_PATH="${TMP}/ruby-build.${SEED}.log"
RUBY_BIN="${PREFIX_PATH}/bin/ruby"

View file

@ -3,6 +3,7 @@
load test_helper
export RUBY_BUILD_SKIP_MIRROR=1
export RUBY_BUILD_CACHE_PATH="$TMP/cache"
export RUBY_BUILD_ARIA2_OPTS=
setup() {
mkdir "$RUBY_BUILD_CACHE_PATH"

View file

@ -3,6 +3,7 @@
load test_helper
export RUBY_BUILD_SKIP_MIRROR=1
export RUBY_BUILD_CACHE_PATH=
export RUBY_BUILD_ARIA2_OPTS=
@test "package URL without checksum" {

View file

@ -4,6 +4,7 @@ load test_helper
export RUBY_BUILD_SKIP_MIRROR=
export RUBY_BUILD_CACHE_PATH=
export RUBY_BUILD_MIRROR_URL=http://mirror.example.com
export RUBY_BUILD_ARIA2_OPTS=
@test "package URL without checksum bypasses mirror" {